Merge pull request #2274 from baude/cobraprep

Migrate to cobra CLI

1 files changed, 19 insertions, 10 deletions

diff --git a/cmd/podman/containers_prune.go b/cmd/podman/containers_prune.go
index 09141e9a3..3f9b46035 100644
--- a/cmd/podman/containers_prune.go
+++ b/cmd/podman/containers_prune.go
@@ -3,30 +3,39 @@ package main
 import (
 	"context"
 
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/adapter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
+	pruneContainersCommand     cliconfig.ContainersPrune
 	pruneContainersDescription = `
 	podman container prune
 
 	Removes all exited containers
 `
 
-	pruneContainersCommand = cli.Command{
-		Name:         "prune",
-		Usage:        "Remove all stopped containers",
-		Description:  pruneContainersDescription,
-		Action:       pruneContainersCmd,
-		OnUsageError: usageErrorHandler,
+	_pruneContainersCommand = &cobra.Command{
+		Use:   "prune",
+		Short: "Remove all stopped containers",
+		Long:  pruneContainersDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			pruneContainersCommand.InputArgs = args
+			pruneContainersCommand.GlobalFlags = MainGlobalOpts
+			return pruneContainersCmd(&pruneContainersCommand)
+		},
 	}
 )
 
+func init() {
+	pruneContainersCommand.Command = _pruneContainersCommand
+}
+
 func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWorkers int, force bool) error {
 	var deleteFuncs []shared.ParallelWorkerInput
 
@@ -60,8 +69,8 @@ func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWork
 	return printParallelOutput(deleteErrors, errCount)
 }
 
-func pruneContainersCmd(c *cli.Context) error {
-	runtime, err := adapter.GetRuntime(c)
+func pruneContainersCmd(c *cliconfig.ContainersPrune) error {
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
@@ -69,7 +78,7 @@ func pruneContainersCmd(c *cli.Context) error {
 
 	maxWorkers := shared.Parallelize("rm")
 	if c.GlobalIsSet("max-workers") {
-		maxWorkers = c.GlobalInt("max-workers")
+		maxWorkers = c.GlobalFlags.MaxWorks
 	}
 	logrus.Debugf("Setting maximum workers to %d", maxWorkers)