From 22d5b2e3053ad66ce3b30eba3adfca70bc8e389d Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 29 Apr 2020 15:44:44 -0700 Subject: V2 enable ps tests * Combine cobra.Command helper functions into validate package from registry and common packages * Introduce ChoiceValue for flags Signed-off-by: Jhon Honce --- cmd/podman/registry/registry.go | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'cmd/podman/registry') diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index 993b14cbc..69e2babfc 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -2,11 +2,9 @@ package registry import ( "context" - "fmt" "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/libpod/pkg/domain/infra" - "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -77,21 +75,6 @@ func NewContainerEngine(cmd *cobra.Command, args []string) (entities.ContainerEn return containerEngine, nil } -func SubCommandExists(cmd *cobra.Command, args []string) error { - if len(args) > 0 { - return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0]) - } - return errors.Errorf("missing command '%[1]s COMMAND'\nTry '%[1]s --help' for more information.", cmd.CommandPath()) -} - -// IdOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag -func IdOrLatestArgs(cmd *cobra.Command, args []string) error { - if len(args) > 1 || (len(args) == 0 && !cmd.Flag("latest").Changed) { - return fmt.Errorf("%s requires a name, id or the '--latest' flag", cmd.Name()) - } - return nil -} - type PodmanOptionsKey struct{} func Context() context.Context { -- cgit v1.2.3-54-g00ecf