Merge pull request #3709 from mheon/volume_inspect

Change backend code for 'volume inspect'

1 files changed, 23 insertions, 1 deletions

diff --git a/cmd/podman/volume_inspect.go b/cmd/podman/volume_inspect.go
index 1ebc5ce60..94c99a58c 100644
--- a/cmd/podman/volume_inspect.go
+++ b/cmd/podman/volume_inspect.go
@@ -1,6 +1,9 @@
 package main
 
 import (
+	"fmt"
+
+	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
@@ -53,5 +56,24 @@ func volumeInspectCmd(c *cliconfig.VolumeInspectValues) error {
 	if err != nil {
 		return err
 	}
-	return generateVolLsOutput(vols, volumeLsOptions{Format: c.Format})
+
+	switch c.Format {
+	case "", formats.JSONString:
+		// Normal format - JSON string
+		jsonOut, err := json.MarshalIndent(vols, "", "     ")
+		if err != nil {
+			return errors.Wrapf(err, "error marshalling inspect JSON")
+		}
+		fmt.Println(string(jsonOut))
+	default:
+		// It's a Go template.
+		interfaces := make([]interface{}, len(vols))
+		for i, vol := range vols {
+			interfaces[i] = vol
+		}
+		out := formats.StdoutTemplateArray{Output: interfaces, Template: c.Format}
+		return out.Out()
+	}
+
+	return nil
 }