diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-06-22 14:29:04 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-06-26 17:09:24 -0700 |
| commit | 6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4 (patch) | |
| tree | ab64703869f9300d486531f5781d825e2d9aaec7 /cmd/podman/pods/rm.go | |
| parent | 673116c063f173ae7ff799a920f9c1ca28194b9d (diff) | |
| download | podman-6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4.tar.gz podman-6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4.tar.bz2 podman-6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4.zip | |
Fixes --remote flag issues
* --remote, --url and --identity are now anchored to podman command.
Subcommands should no longer have issues
* TraverseChildren now set to V1 expectations
* Latest flag now has helper function. Now has consistent usage.
* IsRemote() uses cobra parser to determin if --remote is given
* Moved validation functions from parser pkg to validate pkg
*
Fixes #6598
Fixes #6704
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/pods/rm.go')
| -rw-r--r-- | cmd/podman/pods/rm.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index ec8dae1d1..5a5aa699b 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/libpod/cmd/podman/common" - "github.com/containers/libpod/cmd/podman/parse" "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/spf13/cobra" ) @@ -30,7 +30,7 @@ var ( Long: podRmDescription, RunE: rm, Args: func(cmd *cobra.Command, args []string) error { - return parse.CheckAllLatestAndPodIDFile(cmd, args, false, true) + return validate.CheckAllLatestAndPodIDFile(cmd, args, false, true) }, Example: `podman pod rm mywebserverpod podman pod rm -f 860a4b23 @@ -49,15 +49,15 @@ func init() { flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all running pods") flags.BoolVarP(&rmOptions.Force, "force", "f", false, "Force removal of a running pod by first stopping all containers, then removing all containers in the pod. The default is false") flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing") - flags.BoolVarP(&rmOptions.Latest, "latest", "l", false, "Remove the latest pod podman is aware of") flags.StringArrayVarP(&rmOptions.PodIDFiles, "pod-id-file", "", nil, "Read the pod ID from the file") + validate.AddLatestFlag(rmCommand, &rmOptions.Latest) + if registry.IsRemote() { - _ = flags.MarkHidden("latest") _ = flags.MarkHidden("ignore") } } -func rm(cmd *cobra.Command, args []string) error { +func rm(_ *cobra.Command, args []string) error { ids, err := common.ReadPodIDFiles(rmOptions.PodIDFiles) if err != nil { return err |