From f824b58ba2cc592a24f8b9ca6249cdb263da25ad Mon Sep 17 00:00:00 2001 From: Pingan2017 Date: Tue, 30 Oct 2018 15:57:34 +0800 Subject: [PATCH] validate args for kubectl config view --- pkg/kubectl/cmd/apiresources/apiresources.go | 2 +- pkg/kubectl/cmd/apiresources/apiversions.go | 2 +- pkg/kubectl/cmd/config/view.go | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/apiresources/apiresources.go b/pkg/kubectl/cmd/apiresources/apiresources.go index b3f84bae97..50964547f7 100644 --- a/pkg/kubectl/cmd/apiresources/apiresources.go +++ b/pkg/kubectl/cmd/apiresources/apiresources.go @@ -112,7 +112,7 @@ func (o *ApiResourcesOptions) Validate() error { func (o *ApiResourcesOptions) Complete(cmd *cobra.Command, args []string) error { if len(args) != 0 { - return cmdutil.UsageErrorf(cmd, "unexpected args: %v", args) + return cmdutil.UsageErrorf(cmd, "unexpected arguments: %v", args) } return nil } diff --git a/pkg/kubectl/cmd/apiresources/apiversions.go b/pkg/kubectl/cmd/apiresources/apiversions.go index 5776086075..0ab9f08a78 100644 --- a/pkg/kubectl/cmd/apiresources/apiversions.go +++ b/pkg/kubectl/cmd/apiresources/apiversions.go @@ -65,7 +65,7 @@ func NewCmdApiVersions(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) func (o *ApiVersionsOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error { if len(args) != 0 { - return cmdutil.UsageErrorf(cmd, "unexpected args: %v", args) + return cmdutil.UsageErrorf(cmd, "unexpected arguments: %v", args) } var err error o.discoveryClient, err = f.ToDiscoveryClient() diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index 83b3a847ce..7017cb6a9c 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -82,7 +82,7 @@ func NewCmdConfigView(f cmdutil.Factory, streams genericclioptions.IOStreams, Co Long: view_long, Example: view_example, Run: func(cmd *cobra.Command, args []string) { - cmdutil.CheckErr(o.Complete(cmd)) + cmdutil.CheckErr(o.Complete(cmd, args)) cmdutil.CheckErr(o.Validate()) cmdutil.CheckErr(o.Run()) }, @@ -99,7 +99,10 @@ func NewCmdConfigView(f cmdutil.Factory, streams genericclioptions.IOStreams, Co return cmd } -func (o *ViewOptions) Complete(cmd *cobra.Command) error { +func (o *ViewOptions) Complete(cmd *cobra.Command, args []string) error { + if len(args) != 0 { + return cmdutil.UsageErrorf(cmd, "unexpected arguments: %v", args) + } if o.ConfigAccess.IsExplicitFile() { if !o.Merge.Provided() { o.Merge.Set("false")