From 03da8b641df1c03aea6f9faa3ddc2b0df64ec68b Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Mon, 21 Oct 2019 14:08:41 -0400
Subject: Rewrite backend for remote 'volume inspect'

We need to use the new Inspect() endpoint instead of trying to
JSON the actual volume structs. Currently, the output seems
completely nonsensical; it seems like we're JSONing the struct
for the Varlink connection itself? This should restore sanity and
match the format of remote and local inspect on volumes.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 pkg/adapter/runtime_remote.go | 37 ++++++++++++++++++++++++++++++++-----
 pkg/varlinkapi/volumes.go     | 19 +++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 3b808a2ee..870e86896 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -659,12 +659,39 @@ func (r *LocalRuntime) Push(ctx context.Context, srcName, destination, manifestM
 }
 
 // InspectVolumes returns a slice of volumes based on an arg list or --all
-func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*Volume, error) {
-	reply, err := iopodman.GetVolumes().Call(r.Conn, c.InputArgs, c.All)
-	if err != nil {
-		return nil, err
+func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*libpod.InspectVolumeData, error) {
+	var (
+		inspectData []*libpod.InspectVolumeData
+		volumes     []string
+	)
+
+	if c.All {
+		allVolumes, err := r.Volumes(ctx)
+		if err != nil {
+			return nil, err
+		}
+		for _, vol := range allVolumes {
+			volumes = append(volumes, vol.Name())
+		}
+	} else {
+		for _, arg := range c.InputArgs {
+			volumes = append(volumes, arg)
+		}
 	}
-	return varlinkVolumeToVolume(r, reply), nil
+
+	for _, vol := range volumes {
+		jsonString, err := iopodman.InspectVolume().Call(r.Conn, vol)
+		if err != nil {
+			return nil, err
+		}
+		inspectJSON := new(libpod.InspectVolumeData)
+		if err := json.Unmarshal([]byte(jsonString), inspectJSON); err != nil {
+			return nil, errors.Wrapf(err, "error unmarshalling inspect JSON for volume %s", vol)
+		}
+		inspectData = append(inspectData, inspectJSON)
+	}
+
+	return inspectData, nil
 }
 
 // Volumes returns a slice of adapter.volumes based on information about libpod
diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go
index b41eb5086..0ba76902e 100644
--- a/pkg/varlinkapi/volumes.go
+++ b/pkg/varlinkapi/volumes.go
@@ -3,6 +3,8 @@
 package varlinkapi
 
 import (
+	"encoding/json"
+
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod"
@@ -80,6 +82,23 @@ func (i *LibpodAPI) GetVolumes(call iopodman.VarlinkCall, args []string, all boo
 	return call.ReplyGetVolumes(volumes)
 }
 
+// InspectVolume inspects a single volume, returning its JSON as a string.
+func (i *LibpodAPI) 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 *LibpodAPI) VolumesPrune(call iopodman.VarlinkCall) error {
 	var errs []string
-- 
cgit v1.2.3-54-g00ecf