Merge pull request #2315 from baude/remotevolumerm

podman-remote volume rm

1 files changed, 50 insertions, 1 deletions

diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go
index 3921758ee..485f64bf1 100644
--- a/libpod/runtime_volume.go
+++ b/libpod/runtime_volume.go
@@ -2,6 +2,9 @@ package libpod
 
 import (
 	"context"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"strings"
 )
 
 // Contains the public Runtime API for volumes
@@ -38,6 +41,38 @@ func (r *Runtime) RemoveVolume(ctx context.Context, v *Volume, force, prune bool
 	return r.removeVolume(ctx, v, force, prune)
 }
 
+// RemoveVolumes removes a slice of volumes or all with a force bool
+func (r *Runtime) RemoveVolumes(ctx context.Context, volumes []string, all, force bool) ([]string, error) {
+	var (
+		vols        []*Volume
+		err         error
+		deletedVols []string
+	)
+	if all {
+		vols, err = r.Volumes()
+		if err != nil {
+			return nil, errors.Wrapf(err, "unable to get all volumes")
+		}
+	} else {
+		for _, i := range volumes {
+			vol, err := r.GetVolume(i)
+			if err != nil {
+				return nil, err
+			}
+			vols = append(vols, vol)
+		}
+	}
+
+	for _, vol := range vols {
+		if err := r.RemoveVolume(ctx, vol, force, false); err != nil {
+			return deletedVols, err
+		}
+		logrus.Debugf("removed volume %s", vol.Name())
+		deletedVols = append(deletedVols, vol.Name())
+	}
+	return deletedVols, nil
+}
+
 // GetVolume retrieves a volume by its name
 func (r *Runtime) GetVolume(name string) (*Volume, error) {
 	r.lock.RLock()
@@ -47,7 +82,21 @@ func (r *Runtime) GetVolume(name string) (*Volume, error) {
 		return nil, ErrRuntimeStopped
 	}
 
-	return r.state.Volume(name)
+	vol, err := r.state.Volume(name)
+	if err == nil {
+		return vol, err
+	}
+
+	vols, err := r.GetAllVolumes()
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range vols {
+		if strings.HasPrefix(v.Name(), name) {
+			return v, nil
+		}
+	}
+	return nil, errors.Errorf("unable to find volume %s", name)
 }
 
 // HasVolume checks to see if a volume with the given name exists