From 958d7d3b6e74b8648fb897ce09f52049eb9823a1 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 13:32:40 -0700 Subject: [PATCH] Removes duplicate TabWriter. Several updates to reference the one remaining TabWriter in cli-runtime. --- pkg/kubectl/cmd/auth/BUILD | 1 - pkg/kubectl/cmd/auth/cani.go | 2 +- pkg/kubectl/cmd/get/BUILD | 3 +- pkg/kubectl/cmd/get/customcolumn.go | 3 +- pkg/kubectl/cmd/get/customcolumn_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/apiresources/BUILD | 2 +- .../pkg/cmd/apiresources/apiresources.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/config/BUILD | 1 - .../kubectl/pkg/cmd/config/get_contexts.go | 2 +- .../src/k8s.io/kubectl/pkg/metricsutil/BUILD | 2 +- .../pkg/metricsutil/metrics_printer.go | 2 +- staging/src/k8s.io/kubectl/pkg/util/BUILD | 1 - .../k8s.io/kubectl/pkg/util/printers/BUILD | 24 ------------- .../kubectl/pkg/util/printers/tabwriter.go | 36 ------------------- 14 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 staging/src/k8s.io/kubectl/pkg/util/printers/BUILD delete mode 100644 staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index fc2242791b2..a036a22f18b 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/pkg/kubectl/cmd/auth/BUILD @@ -35,7 +35,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go index cdf8457ffd1..4b45408e5cb 100644 --- a/pkg/kubectl/cmd/auth/cani.go +++ b/pkg/kubectl/cmd/auth/cani.go @@ -33,11 +33,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" discovery "k8s.io/client-go/discovery" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" cmdutil "k8s.io/kubectl/pkg/cmd/util" describeutil "k8s.io/kubectl/pkg/describe/versioned" - "k8s.io/kubectl/pkg/util/printers" rbacutil "k8s.io/kubectl/pkg/util/rbac" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 43d27778bb0..af2e32ee1a8 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -53,7 +53,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/liggitt/tabwriter:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", @@ -96,6 +95,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", @@ -104,7 +104,6 @@ go_test( "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/get/customcolumn.go b/pkg/kubectl/cmd/get/customcolumn.go index afe19e1430e..af99c3f64e4 100644 --- a/pkg/kubectl/cmd/get/customcolumn.go +++ b/pkg/kubectl/cmd/get/customcolumn.go @@ -33,7 +33,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/util/jsonpath" - utilprinters "k8s.io/kubectl/pkg/util/printers" ) var jsonRegexp = regexp.MustCompile(`^\{\.?([^{}]+)\}$|^\.?([^{}]+)$`) @@ -164,7 +163,7 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error } if w, found := out.(*tabwriter.Writer); !found { - w = utilprinters.GetNewTabWriter(out) + w = printers.GetNewTabWriter(out) out = w defer w.Flush() } diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/pkg/kubectl/cmd/get/customcolumn_test.go index 5cb1884d559..e4fb17a8eb7 100644 --- a/pkg/kubectl/cmd/get/customcolumn_test.go +++ b/pkg/kubectl/cmd/get/customcolumn_test.go @@ -25,8 +25,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/kubectl/pkg/scheme" - "k8s.io/kubectl/pkg/util/printers" ) // UniversalDecoder call must specify parameter versions; otherwise it will decode to internal versions. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD index 6898831622a..300b5573c01 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD @@ -15,10 +15,10 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go index af57fda2873..9898f56ef09 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD index 98f9ecb49e3..3f739becaf6 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD @@ -40,7 +40,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/liggitt/tabwriter:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go index 72d02630e87..a9016a4e740 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go @@ -28,11 +28,11 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD b/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD index 0eada92fcbb..04ec229fa6b 100644 --- a/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD @@ -16,9 +16,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go b/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go index 799ca451ccc..0e6e5d6d09d 100644 --- a/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go +++ b/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/kubectl/pkg/util/printers" metricsapi "k8s.io/metrics/pkg/apis/metrics" ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/BUILD b/staging/src/k8s.io/kubectl/pkg/util/BUILD index 37fcf81763a..34d0d8783c8 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/BUILD @@ -89,7 +89,6 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/openapi:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs", diff --git a/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD b/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD deleted file mode 100644 index 164f40669da..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD +++ /dev/null @@ -1,24 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["tabwriter.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/printers", - importpath = "k8s.io/kubectl/pkg/util/printers", - visibility = ["//visibility:public"], - deps = ["//vendor/github.com/liggitt/tabwriter:go_default_library"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go b/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go deleted file mode 100644 index f0ebb5dda08..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package printers - -import ( - "io" - - "github.com/liggitt/tabwriter" -) - -const ( - tabwriterMinWidth = 6 - tabwriterWidth = 4 - tabwriterPadding = 3 - tabwriterPadChar = ' ' - tabwriterFlags = tabwriter.RememberWidths -) - -// GetNewTabWriter returns a tabwriter that translates tabbed columns in input into properly aligned text. -func GetNewTabWriter(output io.Writer) *tabwriter.Writer { - return tabwriter.NewWriter(output, tabwriterMinWidth, tabwriterWidth, tabwriterPadding, tabwriterPadChar, tabwriterFlags) -}