diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-04-29 15:44:44 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-04-29 15:51:37 -0700 |
| commit | 22d5b2e3053ad66ce3b30eba3adfca70bc8e389d (patch) | |
| tree | c01c90c7ab2e853930c12d9b04e5ce0e3cb2d914 /cmd/podman/volumes | |
| parent | 99f8cfc2dc39b11cd315062167f1ffaf85eda946 (diff) | |
| download | podman-22d5b2e3053ad66ce3b30eba3adfca70bc8e389d.tar.gz podman-22d5b2e3053ad66ce3b30eba3adfca70bc8e389d.tar.bz2 podman-22d5b2e3053ad66ce3b30eba3adfca70bc8e389d.zip | |
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 <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/volumes')
| -rw-r--r-- | cmd/podman/volumes/list.go | 4 | ||||
| -rw-r--r-- | cmd/podman/volumes/prune.go | 4 | ||||
| -rw-r--r-- | cmd/podman/volumes/volume.go | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 8cc6fb301..72bf9f25b 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -9,8 +9,8 @@ import ( "strings" "text/tabwriter" - "github.com/containers/libpod/cmd/podman/common" "github.com/containers/libpod/cmd/podman/registry" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -25,7 +25,7 @@ and the output format can be changed to JSON or a user specified Go template.` lsCommand = &cobra.Command{ Use: "ls", Aliases: []string{"list"}, - Args: common.NoArgs, + Args: validate.NoArgs, Short: "List volumes", Long: volumeLsDescription, RunE: list, diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index 77138f4b7..2c3ed88f3 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/containers/libpod/cmd/podman/common" "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/cmd/podman/utils" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -22,7 +22,7 @@ var ( Note all data will be destroyed.` pruneCommand = &cobra.Command{ Use: "prune", - Args: common.NoArgs, + Args: validate.NoArgs, Short: "Remove all unused volumes", Long: volumePruneDescription, RunE: prune, diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index 4d74ff084..3e90d178c 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -2,6 +2,7 @@ package volumes import ( "github.com/containers/libpod/cmd/podman/registry" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/pkg/domain/entities" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ var ( Short: "Manage volumes", Long: "Volumes are created in and can be shared between containers", TraverseChildren: true, - RunE: registry.SubCommandExists, + RunE: validate.SubCommandExists, } ) |