From d413e3f18df2510236ae8783ef2e38434789f2d6 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Sun, 5 May 2019 23:40:09 +0800 Subject: [PATCH] fix golint failures of pkg/kubectl/cmd/help pkg/kubectl/cmd/proxy pkg/kubectl/cmd/util/openapi --- hack/.golint_failures | 3 --- pkg/kubectl/cmd/help/help.go | 4 +++- pkg/kubectl/cmd/proxy/proxy.go | 2 ++ pkg/kubectl/cmd/util/openapi/extensions.go | 1 + pkg/kubectl/cmd/util/openapi/openapi.go | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 4416d4ae215..a128f3259f9 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -131,13 +131,11 @@ pkg/kubectl/cmd/exec pkg/kubectl/cmd/explain pkg/kubectl/cmd/expose pkg/kubectl/cmd/get -pkg/kubectl/cmd/help pkg/kubectl/cmd/label pkg/kubectl/cmd/logs pkg/kubectl/cmd/patch pkg/kubectl/cmd/plugin pkg/kubectl/cmd/portforward -pkg/kubectl/cmd/proxy pkg/kubectl/cmd/replace pkg/kubectl/cmd/rollingupdate pkg/kubectl/cmd/rollout @@ -148,7 +146,6 @@ pkg/kubectl/cmd/taint pkg/kubectl/cmd/testing pkg/kubectl/cmd/top pkg/kubectl/cmd/util -pkg/kubectl/cmd/util/openapi pkg/kubectl/cmd/wait pkg/kubectl/describe/versioned pkg/kubectl/generate diff --git a/pkg/kubectl/cmd/help/help.go b/pkg/kubectl/cmd/help/help.go index c26740b2c0f..2ce9500d866 100644 --- a/pkg/kubectl/cmd/help/help.go +++ b/pkg/kubectl/cmd/help/help.go @@ -29,6 +29,7 @@ var helpLong = templates.LongDesc(i18n.T(` Help provides help for any command in the application. Simply type kubectl help [path to command] for full details.`)) +// NewCmdHelp returns the help Cobra command func NewCmdHelp() *cobra.Command { cmd := &cobra.Command{ Use: "help [command] | STRING_TO_SEARCH", @@ -42,6 +43,7 @@ func NewCmdHelp() *cobra.Command { return cmd } +// RunHelp checks given arguments and executes command func RunHelp(cmd *cobra.Command, args []string) { foundCmd, _, err := cmd.Root().Find(args) @@ -56,7 +58,7 @@ func RunHelp(cmd *cobra.Command, args []string) { cmd.Println(err) argsString := strings.Join(args, " ") - var matchedMsgIsPrinted bool = false + var matchedMsgIsPrinted = false for _, foundCmd := range foundCmd.Commands() { if strings.Contains(foundCmd.Short, argsString) { if !matchedMsgIsPrinted { diff --git a/pkg/kubectl/cmd/proxy/proxy.go b/pkg/kubectl/cmd/proxy/proxy.go index bf54bb21fb8..a115a3d071a 100644 --- a/pkg/kubectl/cmd/proxy/proxy.go +++ b/pkg/kubectl/cmd/proxy/proxy.go @@ -70,6 +70,7 @@ var ( kubectl proxy --api-prefix=/k8s-api`)) ) +// NewCmdProxy returns the proxy Cobra command func NewCmdProxy(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { cmd := &cobra.Command{ Use: "proxy [--port=PORT] [--www=static-dir] [--www-prefix=prefix] [--api-prefix=prefix]", @@ -97,6 +98,7 @@ func NewCmdProxy(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra. return cmd } +// RunProxy checks given arguments and executes command func RunProxy(f cmdutil.Factory, out io.Writer, cmd *cobra.Command) error { path := cmdutil.GetFlagString(cmd, "unix-socket") port := cmdutil.GetFlagInt(cmd, "port") diff --git a/pkg/kubectl/cmd/util/openapi/extensions.go b/pkg/kubectl/cmd/util/openapi/extensions.go index 40eaacead8c..f1b5cdd4f27 100644 --- a/pkg/kubectl/cmd/util/openapi/extensions.go +++ b/pkg/kubectl/cmd/util/openapi/extensions.go @@ -18,6 +18,7 @@ package openapi import "github.com/go-openapi/spec" +// PrintColumnsKey is the key that defines which columns should be printed const PrintColumnsKey = "x-kubernetes-print-columns" // GetPrintColumns looks for the open API extension for the display columns. diff --git a/pkg/kubectl/cmd/util/openapi/openapi.go b/pkg/kubectl/cmd/util/openapi/openapi.go index 80164862198..c8f370b99bf 100644 --- a/pkg/kubectl/cmd/util/openapi/openapi.go +++ b/pkg/kubectl/cmd/util/openapi/openapi.go @@ -44,6 +44,7 @@ type document struct { var _ Resources = &document{} +// NewOpenAPIData creates a new `Resources` out of the openapi document func NewOpenAPIData(doc *openapi_v2.Document) (Resources, error) { models, err := proto.NewOpenAPIData(doc) if err != nil {