Skip to content

Commit 7ce63eb

Browse files
smarterclaytonsmarterclayton
committed
Refactor printers to support rendering as a Table
Return tables from the server.
1 parent f203e42 commit 7ce63eb

22 files changed

Lines changed: 951 additions & 161 deletions

File tree

‎pkg/kubectl/cmd/cmd_test.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func Example_printReplicationControllerWithNamespace() {
192192
},
193193
}
194194
mapper, _ := f.Object()
195-
err := f.PrintObject(cmd, mapper, ctrl, os.Stdout)
195+
err := f.PrintObject(cmd, mapper, ctrl, printers.GetNewTabWriter(os.Stdout))
196196
if err != nil {
197197
fmt.Printf("Unexpected error: %v", err)
198198
}
@@ -247,7 +247,7 @@ func Example_printMultiContainersReplicationControllerWithWide() {
247247
},
248248
}
249249
mapper, _ := f.Object()
250-
err := f.PrintObject(cmd, mapper, ctrl, os.Stdout)
250+
err := f.PrintObject(cmd, mapper, ctrl, printers.GetNewTabWriter(os.Stdout))
251251
if err != nil {
252252
fmt.Printf("Unexpected error: %v", err)
253253
}
@@ -301,7 +301,7 @@ func Example_printReplicationController() {
301301
},
302302
}
303303
mapper, _ := f.Object()
304-
err := f.PrintObject(cmd, mapper, ctrl, os.Stdout)
304+
err := f.PrintObject(cmd, mapper, ctrl, printers.GetNewTabWriter(os.Stdout))
305305
if err != nil {
306306
fmt.Printf("Unexpected error: %v", err)
307307
}
@@ -344,7 +344,7 @@ func Example_printPodWithWideFormat() {
344344
},
345345
}
346346
mapper, _ := f.Object()
347-
err := f.PrintObject(cmd, mapper, pod, os.Stdout)
347+
err := f.PrintObject(cmd, mapper, pod, printers.GetNewTabWriter(os.Stdout))
348348
if err != nil {
349349
fmt.Printf("Unexpected error: %v", err)
350350
}
@@ -390,7 +390,7 @@ func Example_printPodWithShowLabels() {
390390
},
391391
}
392392
mapper, _ := f.Object()
393-
err := f.PrintObject(cmd, mapper, pod, os.Stdout)
393+
err := f.PrintObject(cmd, mapper, pod, printers.GetNewTabWriter(os.Stdout))
394394
if err != nil {
395395
fmt.Printf("Unexpected error: %v", err)
396396
}
@@ -514,7 +514,7 @@ func Example_printPodHideTerminated() {
514514
}
515515
for _, pod := range filteredPodList {
516516
mapper, _ := f.Object()
517-
err := f.PrintObject(cmd, mapper, pod, os.Stdout)
517+
err := f.PrintObject(cmd, mapper, pod, printers.GetNewTabWriter(os.Stdout))
518518
if err != nil {
519519
fmt.Printf("Unexpected error: %v", err)
520520
}
@@ -542,7 +542,7 @@ func Example_printPodShowAll() {
542542
cmd := NewCmdRun(f, os.Stdin, os.Stdout, os.Stderr)
543543
podList := newAllPhasePodList()
544544
mapper, _ := f.Object()
545-
err := f.PrintObject(cmd, mapper, podList, os.Stdout)
545+
err := f.PrintObject(cmd, mapper, podList, printers.GetNewTabWriter(os.Stdout))
546546
if err != nil {
547547
fmt.Printf("Unexpected error: %v", err)
548548
}
@@ -616,9 +616,10 @@ func Example_printServiceWithNamespacesAndLabels() {
616616
}
617617
ld := strings.NewLineDelimiter(os.Stdout, "|")
618618
defer ld.Flush()
619-
619+
out := printers.GetNewTabWriter(ld)
620+
defer out.Flush()
620621
mapper, _ := f.Object()
621-
err := f.PrintObject(cmd, mapper, svc, ld)
622+
err := f.PrintObject(cmd, mapper, svc, out)
622623
if err != nil {
623624
fmt.Printf("Unexpected error: %v", err)
624625
}

‎pkg/printers/BUILD‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ go_library(
2828
"//pkg/util/slice:go_default_library",
2929
"//vendor/github.com/fatih/camelcase:go_default_library",
3030
"//vendor/github.com/ghodss/yaml:go_default_library",
31-
"//vendor/github.com/golang/glog:go_default_library",
3231
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
32+
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
33+
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library",
3334
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
3435
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
3536
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
3637
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
38+
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
3739
"//vendor/k8s.io/client-go/util/jsonpath:go_default_library",
3840
],
3941
)
@@ -63,6 +65,7 @@ filegroup(
6365
srcs = [
6466
":package-srcs",
6567
"//pkg/printers/internalversion:all-srcs",
68+
"//pkg/printers/storage:all-srcs",
6669
],
6770
tags = ["automanaged"],
6871
)

0 commit comments

Comments
 (0)