diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-10-21 14:08:41 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-10-21 14:37:27 -0400 |
commit | 03da8b641df1c03aea6f9faa3ddc2b0df64ec68b (patch) | |
tree | b0df0c2407d83bbd8577edf830ff9436d9bee9c8 /pkg/varlinkapi | |
parent | 6456f6da1742863e8119c0f4b2927f3b1300a942 (diff) | |
download | podman-03da8b641df1c03aea6f9faa3ddc2b0df64ec68b.tar.gz podman-03da8b641df1c03aea6f9faa3ddc2b0df64ec68b.tar.bz2 podman-03da8b641df1c03aea6f9faa3ddc2b0df64ec68b.zip |
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>
Diffstat (limited to 'pkg/varlinkapi')
-rw-r--r-- | pkg/varlinkapi/volumes.go | 19 |
1 files changed, 19 insertions, 0 deletions
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 |