podman-remote volume rm

add the ability to remove/delete volumes with the podman remote
client.

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

3 files changed, 27 insertions, 18 deletions

diff --git a/cmd/podman/commands_remoteclient.go b/cmd/podman/commands_remoteclient.go
index e1f68405e..a656d5a29 100644
--- a/cmd/podman/commands_remoteclient.go
+++ b/cmd/podman/commands_remoteclient.go
@@ -35,6 +35,7 @@ func getPodSubCommands() []*cobra.Command {
 func getVolumeSubCommands() []*cobra.Command {
 	return []*cobra.Command{
 		_volumeCreateCommand,
+		_volumeRmCommand,
 	}
 }
 
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 7263cfea3..b03fde0df 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -34,7 +34,11 @@ type VolumeCreateOpts (
    options: [string]string
 )
 
-
+type VolumeRemoveOpts (
+   volumes: []string,
+   all: bool,
+   force: bool
+)
 
 # ImageInList describes the structure that is returned in
 # ListImages.
@@ -1064,6 +1068,8 @@ method ReceiveFile(path: string, delete: bool) -> (len: int)
 
 method VolumeCreate(options: VolumeCreateOpts) -> (volumeName: string)
 
+method VolumeRemove(options: VolumeRemoveOpts) -> (volumeNames: []string)
+
 
 # ImageNotFound means the image could not be found by the provided name or ID in local storage.
 error ImageNotFound (name: string)
diff --git a/cmd/podman/volume_rm.go b/cmd/podman/volume_rm.go
index b02a06ed9..af05957e8 100644
--- a/cmd/podman/volume_rm.go
+++ b/cmd/podman/volume_rm.go
@@ -4,9 +4,8 @@ import (
 	"fmt"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/libpod/adapter"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -43,25 +42,28 @@ func init() {
 func volumeRmCmd(c *cliconfig.VolumeRmValues) error {
 	var err error
 
-	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
+	if (len(c.InputArgs) > 0 && c.All) || (len(c.InputArgs) < 1 && !c.All) {
+		return errors.New("choose either one or more volumes or all")
+	}
+
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "error creating libpod runtime")
 	}
 	defer runtime.Shutdown(false)
-
-	ctx := getContext()
-
-	vols, lastError := getVolumesFromContext(&c.PodmanCommand, runtime)
-	for _, vol := range vols {
-		err = runtime.RemoveVolume(ctx, vol, c.Force, false)
-		if err != nil {
-			if lastError != nil {
-				logrus.Errorf("%q", lastError)
-			}
-			lastError = errors.Wrapf(err, "failed to remove volume %q", vol.Name())
-		} else {
-			fmt.Println(vol.Name())
+	deletedVolumeNames, err := runtime.RemoveVolumes(getContext(), c)
+	if err != nil {
+		if len(deletedVolumeNames) > 0 {
+			printDeleteVolumes(deletedVolumeNames)
+			return err
 		}
 	}
-	return lastError
+	printDeleteVolumes(deletedVolumeNames)
+	return err
+}
+
+func printDeleteVolumes(volumes []string) {
+	for _, v := range volumes {
+		fmt.Println(v)
+	}
 }