Migrate to cobra CLI

We intend to migrate to the cobra cli from urfave/cli because the
project is more well maintained.  There are also some technical reasons
as well which extend into our remote client work.

Signed-off-by: baude <bbaude@redhat.com>

1 files changed, 27 insertions, 31 deletions

diff --git a/cmd/podman/volume_rm.go b/cmd/podman/volume_rm.go
index 3fb623624..b02a06ed9 100644
--- a/cmd/podman/volume_rm.go
+++ b/cmd/podman/volume_rm.go
@@ -3,51 +3,47 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
-var volumeRmDescription = `
+var (
+	volumeRmCommand     cliconfig.VolumeRmValues
+	volumeRmDescription = `
 podman volume rm
 
 Remove one or more existing volumes. Will only remove volumes that are
 not being used by any containers. To remove the volumes anyways, use the
 --force flag.
 `
+	_volumeRmCommand = &cobra.Command{
+		Use:     "rm",
+		Aliases: []string{"remove"},
+		Short:   "Remove one or more volumes",
+		Long:    volumeRmDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			volumeRmCommand.InputArgs = args
+			volumeRmCommand.GlobalFlags = MainGlobalOpts
+			return volumeRmCmd(&volumeRmCommand)
+		},
+		Example: "[VOLUME-NAME ...]",
+	}
+)
 
-var volumeRmFlags = []cli.Flag{
-	cli.BoolFlag{
-		Name:  "all, a",
-		Usage: "Remove all volumes",
-	},
-	cli.BoolFlag{
-		Name:  "force, f",
-		Usage: "Remove a volume by force, even if it is being used by a container",
-	},
-}
-
-var volumeRmCommand = cli.Command{
-	Name:                   "rm",
-	Aliases:                []string{"remove"},
-	Usage:                  "Remove one or more volumes",
-	Description:            volumeRmDescription,
-	Flags:                  volumeRmFlags,
-	Action:                 volumeRmCmd,
-	ArgsUsage:              "[VOLUME-NAME ...]",
-	SkipArgReorder:         true,
-	UseShortOptionHandling: true,
+func init() {
+	volumeRmCommand.Command = _volumeRmCommand
+	flags := volumeRmCommand.Flags()
+	flags.BoolVarP(&volumeRmCommand.All, "all", "a", false, "Remove all volumes")
+	flags.BoolVarP(&volumeRmCommand.Force, "force", "f", false, "Remove a volume by force, even if it is being used by a container")
 }
 
-func volumeRmCmd(c *cli.Context) error {
+func volumeRmCmd(c *cliconfig.VolumeRmValues) error {
 	var err error
 
-	if err = validateFlags(c, volumeRmFlags); err != nil {
-		return err
-	}
-
-	runtime, err := libpodruntime.GetRuntime(c)
+	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "error creating libpod runtime")
 	}
@@ -55,9 +51,9 @@ func volumeRmCmd(c *cli.Context) error {
 
 	ctx := getContext()
 
-	vols, lastError := getVolumesFromContext(c, runtime)
+	vols, lastError := getVolumesFromContext(&c.PodmanCommand, runtime)
 	for _, vol := range vols {
-		err = runtime.RemoveVolume(ctx, vol, c.Bool("force"), false)
+		err = runtime.RemoveVolume(ctx, vol, c.Force, false)
 		if err != nil {
 			if lastError != nil {
 				logrus.Errorf("%q", lastError)