upstream DefaultSubCommandRun util

juanvallejo · juanvallejo · commit 85cdd34d1450 · 2016-10-13T16:20:43.000-04:00
diff --git a/pkg/cmd/admin/admin.go b/pkg/cmd/admin/admin.go
@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/admin/cert"
 	diagnostics "github.com/openshift/origin/pkg/cmd/admin/diagnostics"
@@ -43,7 +44,7 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
 		Use:   name,
 		Short: "Tools for managing a cluster",
 		Long:  fmt.Sprintf(adminLong),
-		Run:   cmdutil.DefaultSubCommandRun(out),
+		Run:   kcmdutil.DefaultSubCommandRun(out),
 	}
 
 	f := clientcmd.New(cmds.PersistentFlags())
diff --git a/pkg/cmd/admin/cert/cert.go b/pkg/cmd/admin/cert/cert.go
@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/server/admin"
-	"github.com/openshift/origin/pkg/cmd/util"
 )
 
 const CertRecommendedName = "ca"
@@ -18,7 +18,7 @@ func NewCmdCert(name, fullName string, out io.Writer, errout io.Writer) *cobra.C
 		Use:   name,
 		Short: "Manage certificates and keys",
 		Long:  `Manage certificates and keys`,
-		Run:   util.DefaultSubCommandRun(errout),
+		Run:   cmdutil.DefaultSubCommandRun(errout),
 	}
 
 	cmds.AddCommand(admin.NewCommandCreateMasterCerts(admin.CreateMasterCertsCommandName, fullName+" "+admin.CreateMasterCertsCommandName, out))
diff --git a/pkg/cmd/admin/groups/groups.go b/pkg/cmd/admin/groups/groups.go
@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/admin/groups/sync/cli"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/migrate/migrate.go b/pkg/cmd/admin/migrate/migrate.go
@@ -4,8 +4,8 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/network/pod_network.go b/pkg/cmd/admin/network/pod_network.go
@@ -4,8 +4,8 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/policy/policy.go b/pkg/cmd/admin/policy/policy.go
@@ -6,6 +6,7 @@ import (
 
 	kapi "k8s.io/kubernetes/pkg/api"
 	kapierrors "k8s.io/kubernetes/pkg/api/errors"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/uuid"
 
@@ -14,7 +15,6 @@ import (
 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"
 	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/templates"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/prune/prune.go b/pkg/cmd/admin/prune/prune.go
@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	groups "github.com/openshift/origin/pkg/cmd/admin/groups/sync/cli"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/top/top.go b/pkg/cmd/admin/top/top.go
@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 
 	kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/admin/validate/validate.go b/pkg/cmd/admin/validate/validate.go
@@ -4,8 +4,7 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
-
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 const (
diff --git a/pkg/cmd/cli/cli.go b/pkg/cmd/cli/cli.go
@@ -12,6 +12,7 @@ import (
 	"github.com/spf13/pflag"
 
 	kubecmd "k8s.io/kubernetes/pkg/kubectl/cmd"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/admin"
 	"github.com/openshift/origin/pkg/cmd/cli/cmd"
@@ -28,7 +29,6 @@ import (
 	"github.com/openshift/origin/pkg/cmd/cli/secrets"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	"github.com/openshift/origin/pkg/cmd/templates"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
@@ -79,7 +79,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 		Long:  cliLong,
 		Run: func(c *cobra.Command, args []string) {
 			c.SetOutput(out)
-			cmdutil.RequireNoArguments(c, args)
+			kcmdutil.RequireNoArguments(c, args)
 			fmt.Fprint(out, cliLong)
 			fmt.Fprintf(out, cliExplain, fullName)
 		},
diff --git a/pkg/cmd/cli/cmd/cluster/cluster.go b/pkg/cmd/cli/cmd/cluster/cluster.go
@@ -5,9 +5,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/bootstrap/docker"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/cli/cmd/create/route.go b/pkg/cmd/cli/cmd/create/route.go
@@ -31,7 +31,7 @@ func NewCmdCreateRoute(fullName string, f *clientcmd.Factory, out, errOut io.Wri
 		Use:   "route",
 		Short: "Expose containers externally via secured routes",
 		Long:  fmt.Sprintf(routeLong, fullName),
-		Run:   cmdutil.DefaultSubCommandRun(errOut),
+		Run:   kcmdutil.DefaultSubCommandRun(errOut),
 	}
 
 	cmd.AddCommand(NewCmdCreateEdgeRoute(fullName, f, out))
diff --git a/pkg/cmd/cli/cmd/importer/import.go b/pkg/cmd/cli/cmd/importer/import.go
@@ -5,9 +5,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 const (
diff --git a/pkg/cmd/cli/cmd/rollout/rollout.go b/pkg/cmd/cli/cmd/rollout/rollout.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/rollout"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/cli/cmd/set/set.go b/pkg/cmd/cli/cmd/set/set.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/set"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/cmd/templates"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/cli/cmd/types.go b/pkg/cmd/cli/cmd/types.go
@@ -9,7 +9,8 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/spf13/cobra"
 
-	ocutil "github.com/openshift/origin/pkg/cmd/util"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
@@ -230,7 +231,7 @@ func NewCmdTypes(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co
 		Short:   "An introduction to concepts and types",
 		Long:    fmt.Sprintf(typesLong, buf.String()),
 		Example: fmt.Sprintf(typesExample, fullName),
-		Run:     ocutil.DefaultSubCommandRun(out),
+		Run:     kcmdutil.DefaultSubCommandRun(out),
 	}
 	return cmd
 }
diff --git a/pkg/cmd/cli/policy/policy.go b/pkg/cmd/cli/policy/policy.go
@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	adminpolicy "github.com/openshift/origin/pkg/cmd/admin/policy"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/cli/sa/subcommand.go b/pkg/cmd/cli/sa/subcommand.go
@@ -4,8 +4,8 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/cli/secrets/subcommand.go b/pkg/cmd/cli/secrets/subcommand.go
@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/build/builder/cmd/scmauth"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/experimental/config/config.go b/pkg/cmd/experimental/config/config.go
@@ -4,8 +4,8 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
diff --git a/pkg/cmd/openshift/openshift.go b/pkg/cmd/openshift/openshift.go
@@ -9,6 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+
 	"github.com/openshift/origin/pkg/cmd/admin"
 	diagnostics "github.com/openshift/origin/pkg/cmd/admin/diagnostics"
 	sync "github.com/openshift/origin/pkg/cmd/admin/groups/sync/cli"
@@ -106,7 +108,7 @@ func NewCommandOpenShift(name string) *cobra.Command {
 		Use:   name,
 		Short: "Build, deploy, and manage your cloud applications",
 		Long:  fmt.Sprintf(openshiftLong, name, cmdutil.GetPlatformName(name), cmdutil.GetDistributionName(name)),
-		Run:   cmdutil.DefaultSubCommandRun(out),
+		Run:   kcmdutil.DefaultSubCommandRun(out),
 	}
 
 	f := clientcmd.New(pflag.NewFlagSet("", pflag.ContinueOnError))
diff --git a/pkg/cmd/server/start/kubernetes/kubernetes.go b/pkg/cmd/server/start/kubernetes/kubernetes.go
@@ -9,6 +9,8 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+
 	"github.com/openshift/origin/pkg/cmd/cli/cmd"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 )
@@ -25,7 +27,7 @@ func NewCommand(name, fullName string, out, errOut io.Writer) *cobra.Command {
 		Use:   name,
 		Short: "Kubernetes server components",
 		Long:  fmt.Sprintf(kubernetesLong),
-		Run: cmdutil.DefaultSubCommandRun(errOut),
+		Run:   kcmdutil.DefaultSubCommandRun(errOut),
 	}
 
 	cmds.AddCommand(NewAPIServerCommand("apiserver", fullName+" apiserver", out))
diff --git a/pkg/cmd/util/cmd.go b/pkg/cmd/util/cmd.go
@@ -30,21 +30,6 @@ func ReplaceCommandName(from, to string, c *cobra.Command) *cobra.Command {
 	return c
 }
 
-// RequireNoArguments exits with a usage error if extra arguments are provided.
-func RequireNoArguments(c *cobra.Command, args []string) {
-	if len(args) > 0 {
-		kcmdutil.CheckErr(kcmdutil.UsageError(c, fmt.Sprintf(`unknown command "%s"`, strings.Join(args, " "))))
-	}
-}
-
-func DefaultSubCommandRun(out io.Writer) func(c *cobra.Command, args []string) {
-	return func(c *cobra.Command, args []string) {
-		c.SetOutput(out)
-		RequireNoArguments(c, args)
-		c.Help()
-	}
-}
-
 // GetDisplayFilename returns the absolute path of the filename as long as there was no error, otherwise it returns the filename as-is
 func GetDisplayFilename(filename string) string {
 	if absName, err := filepath.Abs(filename); err == nil {

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import (`
`4`	`4`	`"io"`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
	`7`	`+ cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"`
`7`	`8`
`8`	`9`	`"github.com/openshift/origin/pkg/cmd/admin/groups/sync/cli"`
`9`		`- cmdutil "github.com/openshift/origin/pkg/cmd/util"`
`10`	`10`	`"github.com/openshift/origin/pkg/cmd/util/clientcmd"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"io"`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
	`7`	`+ cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"`
`7`	`8`
`8`		`- cmdutil "github.com/openshift/origin/pkg/cmd/util"`
`9`	`9`	`"github.com/openshift/origin/pkg/cmd/util/clientcmd"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"github.com/spf13/cobra"`
`7`	`7`
`8`	`8`	`kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"`
	`9`	`+ cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"`
`9`	`10`
`10`		`- cmdutil "github.com/openshift/origin/pkg/cmd/util"`
`11`	`11`	`"github.com/openshift/origin/pkg/cmd/util/clientcmd"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@ import (`
`4`	`4`	`"io"`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
`7`		`-`
`8`		`- cmdutil "github.com/openshift/origin/pkg/cmd/util"`
	`7`	`+ cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"`
`9`	`8`	`)`
`10`	`9`
`11`	`10`	`const (`