1 files changed, 44 insertions, 46 deletions
diff --git a/cmd/podman/pod_rm.go b/cmd/podman/pod_rm.go
index 49f2104cf..ba16d03c7 100644
--- a/cmd/podman/pod_rm.go
+++ b/cmd/podman/pod_rm.go
@@ -3,71 +3,69 @@ package main
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
-	podRmFlags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "all, a",
-			Usage: "Remove all pods",
-		},
-		cli.BoolFlag{
-			Name:  "force, f",
-			Usage: "Force removal of a running pod by first stopping all containers, then removing all containers in the pod.  The default is false",
-		},
-		LatestPodFlag,
-	}
+	podRmCommand     cliconfig.PodRmValues
 	podRmDescription = fmt.Sprintf(`
 podman rm will remove one or more pods from the host. The pod name or ID can
 be used.  A pod with containers will not be removed without --force.
 If --force is specified, all containers will be stopped, then removed.
 `)
-	podRmCommand = cli.Command{
-		Name:                   "rm",
-		Usage:                  "Remove one or more pods",
-		Description:            podRmDescription,
-		Flags:                  sortFlags(podRmFlags),
-		Action:                 podRmCmd,
-		ArgsUsage:              "[POD ...]",
-		UseShortOptionHandling: true,
-		OnUsageError:           usageErrorHandler,
+	_podRmCommand = &cobra.Command{
+		Use:   "rm",
+		Short: "Remove one or more pods",
+		Long:  podRmDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			podRmCommand.InputArgs = args
+			podRmCommand.GlobalFlags = MainGlobalOpts
+			return podRmCmd(&podRmCommand)
+		},
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkAllAndLatest(cmd, args, false)
+		},
+		Example: `podman pod rm mywebserverpod
+  podman pod rm -f 860a4b23
+  podman pod rm -f -a`,
 	}
 )
 
-// saveCmd saves the image to either docker-archive or oci
-func podRmCmd(c *cli.Context) error {
-	if err := checkMutuallyExclusiveFlags(c); err != nil {
-		return err
-	}
+func init() {
+	podRmCommand.Command = _podRmCommand
+	podRmCommand.SetUsageTemplate(UsageTemplate())
+	flags := podRmCommand.Flags()
+	flags.BoolVarP(&podRmCommand.All, "all", "a", false, "Remove all running pods")
+	flags.BoolVarP(&podRmCommand.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(&podRmCommand.Latest, "latest", "l", false, "Remove the latest pod podman is aware of")
+	markFlagHiddenForRemoteClient("latest", flags)
+}
 
-	runtime, err := libpodruntime.GetRuntime(c)
+// podRmCmd deletes pods
+func podRmCmd(c *cliconfig.PodRmValues) error {
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
+	podRmIds, podRmErrors := runtime.RemovePods(getContext(), c)
+	for _, p := range podRmIds {
+		fmt.Println(p)
+	}
+	if len(podRmErrors) == 0 {
+		return nil
+	}
+	// Grab the last error
+	lastError := podRmErrors[len(podRmErrors)-1]
+	// Remove the last error from the error slice
+	podRmErrors = podRmErrors[:len(podRmErrors)-1]
 
-	ctx := getContext()
-	force := c.Bool("force")
-
-	// getPodsFromContext returns an error when a requested pod
-	// isn't found. The only fatal error scenerio is when there are no pods
-	// in which case the following loop will be skipped.
-	pods, lastError := getPodsFromContext(c, runtime)
-
-	for _, pod := range pods {
-		err = runtime.RemovePod(ctx, pod, force, force)
-		if err != nil {
-			if lastError != nil {
-				logrus.Errorf("%q", lastError)
-			}
-			lastError = errors.Wrapf(err, "failed to delete pod %v", pod.ID())
-		} else {
-			fmt.Println(pod.ID())
-		}
+	for _, err := range podRmErrors {
+		logrus.Errorf("%q", err)
 	}
 	return lastError
 }