Merge pull request #5593 from baude/v2volumes

podmanv2 volumes

5 files changed, 162 insertions, 45 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 47deb010a..a3da310c2 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -239,23 +239,3 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
 	}
 	return reports, nil
 }
-
-func (ic *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
-	panic("implement me")
-}
-
-func (ic *ContainerEngine) PodDelete(ctx context.Context, opts entities.PodPruneOptions) (*entities.PodDeleteReport, error) {
-	panic("implement me")
-}
-
-func (ic *ContainerEngine) PodPrune(ctx context.Context) (*entities.PodPruneReport, error) {
-	panic("implement me")
-}
-
-func (ic *ContainerEngine) VolumeDelete(ctx context.Context, opts entities.VolumeDeleteOptions) (*entities.VolumeDeleteReport, error) {
-	panic("implement me")
-}
-
-func (ic *ContainerEngine) VolumePrune(ctx context.Context) (*entities.VolumePruneReport, error) {
-	panic("implement me")
-}
diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go
index 0783af441..0cc20474e 100644
--- a/pkg/domain/infra/abi/volumes.go
+++ b/pkg/domain/infra/abi/volumes.go
@@ -7,7 +7,9 @@ import (
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/domain/filters"
 	"github.com/containers/libpod/pkg/domain/infra/abi/parse"
+	"github.com/pkg/errors"
 )
 
 func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IdOrNameResponse, error) {
@@ -36,3 +38,109 @@ func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.Volum
 	}
 	return &entities.IdOrNameResponse{IdOrName: vol.Name()}, nil
 }
+
+func (ic *ContainerEngine) VolumeRm(ctx context.Context, namesOrIds []string, opts entities.VolumeRmOptions) ([]*entities.VolumeRmReport, error) {
+	var (
+		err     error
+		reports []*entities.VolumeRmReport
+		vols    []*libpod.Volume
+	)
+	if opts.All {
+		vols, err = ic.Libpod.Volumes()
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		for _, id := range namesOrIds {
+			vol, err := ic.Libpod.LookupVolume(id)
+			if err != nil {
+				reports = append(reports, &entities.VolumeRmReport{
+					Err: err,
+					Id:  id,
+				})
+				continue
+			}
+			vols = append(vols, vol)
+		}
+	}
+	for _, vol := range vols {
+		reports = append(reports, &entities.VolumeRmReport{
+			Err: ic.Libpod.RemoveVolume(ctx, vol, opts.Force),
+			Id:  vol.Name(),
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) VolumeInspect(ctx context.Context, namesOrIds []string, opts entities.VolumeInspectOptions) ([]*entities.VolumeInspectReport, error) {
+	var (
+		err     error
+		reports []*entities.VolumeInspectReport
+		vols    []*libpod.Volume
+	)
+
+	// Note: as with previous implementation, a single failure here
+	// results a return.
+	if opts.All {
+		vols, err = ic.Libpod.GetAllVolumes()
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		for _, v := range namesOrIds {
+			vol, err := ic.Libpod.LookupVolume(v)
+			if err != nil {
+				return nil, errors.Wrapf(err, "error inspecting volume %s", v)
+			}
+			vols = append(vols, vol)
+		}
+	}
+	for _, v := range vols {
+		config := entities.VolumeConfigResponse{
+			Name:       v.Name(),
+			Driver:     v.Driver(),
+			Mountpoint: v.MountPoint(),
+			CreatedAt:  v.CreatedTime(),
+			Labels:     v.Labels(),
+			Scope:      v.Scope(),
+			Options:    v.Options(),
+			UID:        v.UID(),
+			GID:        v.GID(),
+		}
+		reports = append(reports, &entities.VolumeInspectReport{&config})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) VolumePrune(ctx context.Context, opts entities.VolumePruneOptions) ([]*entities.VolumePruneReport, error) {
+	return ic.Libpod.PruneVolumes(ctx)
+}
+
+func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeListOptions) ([]*entities.VolumeListReport, error) {
+	var (
+		reports []*entities.VolumeListReport
+	)
+	volumeFilters, err := filters.GenerateVolumeFilters(opts.Filter)
+	if err != nil {
+		return nil, err
+	}
+	vols, err := ic.Libpod.Volumes(volumeFilters...)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range vols {
+		config := entities.VolumeConfigResponse{
+			Name:       v.Name(),
+			Driver:     v.Driver(),
+			Mountpoint: v.MountPoint(),
+			CreatedAt:  v.CreatedTime(),
+			Labels:     v.Labels(),
+			Scope:      v.Scope(),
+			Options:    v.Options(),
+			UID:        v.UID(),
+			GID:        v.GID(),
+		}
+		reports = append(reports, &entities.VolumeListReport{config})
+	}
+	return reports, nil
+}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 21f62df6b..a8ecff41b 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -33,13 +33,6 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin
 	return responses, nil
 }
 
-func (r *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
-	panic("implement me")
-}
 func (ic *ContainerEngine) ContainerPause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
 	var (
 		reports []*entities.PauseUnpauseReport
diff --git a/pkg/domain/infra/tunnel/runtime.go b/pkg/domain/infra/tunnel/runtime.go
index eb9b34e4a..c111f99e9 100644
--- a/pkg/domain/infra/tunnel/runtime.go
+++ b/pkg/domain/infra/tunnel/runtime.go
@@ -2,8 +2,6 @@ package tunnel
 
 import (
 	"context"
-
-	"github.com/containers/libpod/pkg/domain/entities"
 )
 
 // Image-related runtime using an ssh-tunnel to utilize Podman service
@@ -15,19 +13,3 @@ type ImageEngine struct {
 type ContainerEngine struct {
 	ClientCxt context.Context
 }
-
-func (r *ContainerEngine) PodDelete(ctx context.Context, opts entities.PodPruneOptions) (*entities.PodDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *ContainerEngine) PodPrune(ctx context.Context) (*entities.PodPruneReport, error) {
-	panic("implement me")
-}
-
-func (r *ContainerEngine) VolumeDelete(ctx context.Context, opts entities.VolumeDeleteOptions) (*entities.VolumeDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *ContainerEngine) VolumePrune(ctx context.Context) (*entities.VolumePruneReport, error) {
-	panic("implement me")
-}
diff --git a/pkg/domain/infra/tunnel/volumes.go b/pkg/domain/infra/tunnel/volumes.go
index 49cf6a2f6..e48a7fa7c 100644
--- a/pkg/domain/infra/tunnel/volumes.go
+++ b/pkg/domain/infra/tunnel/volumes.go
@@ -14,3 +14,57 @@ func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.Volum
 	}
 	return &entities.IdOrNameResponse{IdOrName: response.Name}, nil
 }
+
+func (ic *ContainerEngine) VolumeRm(ctx context.Context, namesOrIds []string, opts entities.VolumeRmOptions) ([]*entities.VolumeRmReport, error) {
+	var (
+		reports []*entities.VolumeRmReport
+	)
+
+	if opts.All {
+		vols, err := volumes.List(ic.ClientCxt, nil)
+		if err != nil {
+			return nil, err
+		}
+		for _, v := range vols {
+			namesOrIds = append(namesOrIds, v.Name)
+		}
+	}
+	for _, id := range namesOrIds {
+		reports = append(reports, &entities.VolumeRmReport{
+			Err: volumes.Remove(ic.ClientCxt, id, &opts.Force),
+			Id:  id,
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) VolumeInspect(ctx context.Context, namesOrIds []string, opts entities.VolumeInspectOptions) ([]*entities.VolumeInspectReport, error) {
+	var (
+		reports []*entities.VolumeInspectReport
+	)
+	if opts.All {
+		vols, err := volumes.List(ic.ClientCxt, nil)
+		if err != nil {
+			return nil, err
+		}
+		for _, v := range vols {
+			namesOrIds = append(namesOrIds, v.Name)
+		}
+	}
+	for _, id := range namesOrIds {
+		data, err := volumes.Inspect(ic.ClientCxt, id)
+		if err != nil {
+			return nil, err
+		}
+		reports = append(reports, &entities.VolumeInspectReport{VolumeConfigResponse: data})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) VolumePrune(ctx context.Context, opts entities.VolumePruneOptions) ([]*entities.VolumePruneReport, error) {
+	return volumes.Prune(ic.ClientCxt)
+}
+
+func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeListOptions) ([]*entities.VolumeListReport, error) {
+	return volumes.List(ic.ClientCxt, opts.Filter)
+}