From 9934507d74c97bccb753b04873eb74652600b6ff Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 26 Feb 2019 12:28:35 -0700 Subject: Command-line input validation: reject unused args Several podman commands accept no subcommands. Some of those were not actually checking, though, which could lead to user confusion. Added validation where missing; and, refactored to minimize duplication. (Side note: I decided against using cobra.NoArgs because its error message, "unknown command", misleadingly implies that there are known ones). Also added validation to varlink Signed-off-by: Ed Santiago --- cmd/podman/pod_ps.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cmd/podman/pod_ps.go') diff --git a/cmd/podman/pod_ps.go b/cmd/podman/pod_ps.go index 70e077651..8e48740e6 100644 --- a/cmd/podman/pod_ps.go +++ b/cmd/podman/pod_ps.go @@ -121,6 +121,7 @@ var ( _podPsCommand = &cobra.Command{ Use: "ps", Aliases: []string{"ls", "list"}, + Args: noSubArgs, Short: "List pods", Long: podPsDescription, RunE: func(cmd *cobra.Command, args []string) error { @@ -160,10 +161,6 @@ func podPsCmd(c *cliconfig.PodPsValues) error { } defer runtime.Shutdown(false) - if len(c.InputArgs) > 0 { - return errors.Errorf("too many arguments, ps takes no arguments") - } - opts := podPsOptions{ NoTrunc: c.NoTrunc, Quiet: c.Quiet, -- cgit v1.2.3-54-g00ecf