1 files changed, 0 insertions, 165 deletions
diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go
deleted file mode 100644
index 7cc714ea4..000000000
--- a/pkg/varlinkapi/volumes.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// +build varlink
-
-package varlinkapi
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/containers/podman/v2/libpod"
-	"github.com/containers/podman/v2/pkg/domain/infra/abi/parse"
-	iopodman "github.com/containers/podman/v2/pkg/varlink"
-)
-
-// VolumeCreate creates a libpod volume based on input from a varlink connection
-func (i *VarlinkAPI) VolumeCreate(call iopodman.VarlinkCall, options iopodman.VolumeCreateOpts) error {
-	var volumeOptions []libpod.VolumeCreateOption
-
-	if len(options.VolumeName) > 0 {
-		volumeOptions = append(volumeOptions, libpod.WithVolumeName(options.VolumeName))
-	}
-	if len(options.Driver) > 0 {
-		volumeOptions = append(volumeOptions, libpod.WithVolumeDriver(options.Driver))
-	}
-	if len(options.Labels) > 0 {
-		volumeOptions = append(volumeOptions, libpod.WithVolumeLabels(options.Labels))
-	}
-	if len(options.Options) > 0 {
-		parsedOptions, err := parse.VolumeOptions(options.Options)
-		if err != nil {
-			return call.ReplyErrorOccurred(err.Error())
-		}
-		volumeOptions = append(volumeOptions, parsedOptions...)
-	}
-	newVolume, err := i.Runtime.NewVolume(getContext(), volumeOptions...)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	return call.ReplyVolumeCreate(newVolume.Name())
-}
-
-// VolumeRemove removes volumes by options.All or options.Volumes
-func (i *VarlinkAPI) VolumeRemove(call iopodman.VarlinkCall, options iopodman.VolumeRemoveOpts) error {
-	success, failed, err := SharedRemoveVolumes(getContext(), i.Runtime, options.Volumes, options.All, options.Force)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	// Convert map[string]string to map[string]error
-	errStrings := make(map[string]string)
-	for k, v := range failed {
-		errStrings[k] = v.Error()
-	}
-	return call.ReplyVolumeRemove(success, errStrings)
-}
-
-// GetVolumes returns all the volumes known to the remote system
-func (i *VarlinkAPI) GetVolumes(call iopodman.VarlinkCall, args []string, all bool) error {
-	var (
-		err     error
-		reply   []*libpod.Volume
-		volumes []iopodman.Volume
-	)
-	if all {
-		reply, err = i.Runtime.GetAllVolumes()
-	} else {
-		for _, v := range args {
-			vol, err := i.Runtime.GetVolume(v)
-			if err != nil {
-				return err
-			}
-			reply = append(reply, vol)
-		}
-	}
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	// Build the iopodman.volume struct for the return
-	for _, v := range reply {
-		newVol := iopodman.Volume{
-			Driver:     v.Driver(),
-			Labels:     v.Labels(),
-			MountPoint: v.MountPoint(),
-			Name:       v.Name(),
-			Options:    v.Options(),
-		}
-		volumes = append(volumes, newVol)
-	}
-	return call.ReplyGetVolumes(volumes)
-}
-
-// InspectVolume inspects a single volume, returning its JSON as a string.
-func (i *VarlinkAPI) InspectVolume(call iopodman.VarlinkCall, name string) error {
-	vol, err := i.Runtime.LookupVolume(name)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	inspectOut, err := vol.Inspect()
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	inspectJSON, err := json.Marshal(inspectOut)
-	if err != nil {
-		return call.ReplyErrorOccurred(err.Error())
-	}
-	return call.ReplyInspectVolume(string(inspectJSON))
-}
-
-// VolumesPrune removes unused images via a varlink call
-func (i *VarlinkAPI) VolumesPrune(call iopodman.VarlinkCall) error {
-	var (
-		prunedErrors []string
-		prunedNames  []string
-	)
-	responses, err := i.Runtime.PruneVolumes(getContext())
-	if err != nil {
-		return call.ReplyVolumesPrune([]string{}, []string{err.Error()})
-	}
-	for k, v := range responses {
-		if v == nil {
-			prunedNames = append(prunedNames, k)
-		} else {
-			prunedErrors = append(prunedErrors, v.Error())
-		}
-	}
-	return call.ReplyVolumesPrune(prunedNames, prunedErrors)
-}
-
-// Remove given set of volumes
-func SharedRemoveVolumes(ctx context.Context, runtime *libpod.Runtime, vols []string, all, force bool) ([]string, map[string]error, error) {
-	var (
-		toRemove []*libpod.Volume
-		success  []string
-		failed   map[string]error
-	)
-
-	failed = make(map[string]error)
-
-	if all {
-		vols, err := runtime.Volumes()
-		if err != nil {
-			return nil, nil, err
-		}
-		toRemove = vols
-	} else {
-		for _, v := range vols {
-			vol, err := runtime.LookupVolume(v)
-			if err != nil {
-				failed[v] = err
-				continue
-			}
-			toRemove = append(toRemove, vol)
-		}
-	}
-
-	// We could parallelize this, but I haven't heard anyone complain about
-	// performance here yet, so hold off.
-	for _, vol := range toRemove {
-		if err := runtime.RemoveVolume(ctx, vol, force); err != nil {
-			failed[vol.Name()] = err
-			continue
-		}
-		success = append(success, vol.Name())
-	}
-
-	return success, failed, nil
-}