Merge pull request #14111 from openshift-cherrypick-robot/cherry-pick-14099-to-v4.1

[v4.1] Implement --format for machine inspect

1 files changed, 24 insertions, 7 deletions

diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go
index 21e5074b7..a1f467bbb 100644
--- a/cmd/podman/machine/inspect.go
+++ b/cmd/podman/machine/inspect.go
@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"os"
 
+	"github.com/containers/common/pkg/report"
 	"github.com/containers/podman/v4/cmd/podman/common"
 	"github.com/containers/podman/v4/cmd/podman/registry"
 	"github.com/containers/podman/v4/cmd/podman/utils"
-	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/machine"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -66,12 +66,29 @@ func inspect(cmd *cobra.Command, args []string) error {
 		}
 		vms = append(vms, *ii)
 	}
-	if len(inspectFlag.format) > 0 {
-		// need jhonce to work his template magic
-		return define.ErrNotImplemented
-	}
-	if err := printJSON(vms); err != nil {
-		logrus.Error(err)
+	switch {
+	case cmd.Flag("format").Changed:
+		row := report.NormalizeFormat(inspectFlag.format)
+		row = report.EnforceRange(row)
+
+		tmpl, err := report.NewTemplate("Machine inspect").Parse(row)
+		if err != nil {
+			return err
+		}
+
+		w, err := report.NewWriterDefault(os.Stdout)
+		if err != nil {
+			return err
+		}
+
+		if err := tmpl.Execute(w, vms); err != nil {
+			logrus.Error(err)
+		}
+		w.Flush()
+	default:
+		if err := printJSON(vms); err != nil {
+			logrus.Error(err)
+		}
 	}
 	return errs.PrintErrors()
 }