Merge pull request #12490 from jwhonce/issues/10974-3

Refactor podman pods to report.Formatter

1 files changed, 6 insertions, 13 deletions

diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go
index d4b8df90e..fd34d255f 100644
--- a/cmd/podman/pods/inspect.go
+++ b/cmd/podman/pods/inspect.go
@@ -3,6 +3,7 @@ package pods
 import (
 	"context"
 	"os"
+	"text/template"
 
 	"github.com/containers/common/pkg/report"
 	"github.com/containers/podman/v3/cmd/podman/common"
@@ -64,25 +65,17 @@ func inspect(cmd *cobra.Command, args []string) error {
 	}
 
 	if report.IsJSON(inspectOptions.Format) {
-		json.MarshalIndent(responses, "", "     ")
 		enc := json.NewEncoder(os.Stdout)
 		enc.SetIndent("", "     ")
 		return enc.Encode(responses)
 	}
 
-	// cmd.Flags().Changed("format") must be true to reach this code
-	row := report.NormalizeFormat(inspectOptions.Format)
-
-	t, err := report.NewTemplate("inspect").Parse(row)
-	if err != nil {
-		return err
-	}
-
-	w, err := report.NewWriterDefault(os.Stdout)
+	// Cannot use report.New() as it enforces {{range .}} for OriginUser templates
+	tmpl := template.New(cmd.Name()).Funcs(template.FuncMap(report.DefaultFuncs))
+	format := report.NormalizeFormat(inspectOptions.Format)
+	tmpl, err = tmpl.Parse(format)
 	if err != nil {
 		return err
 	}
-	err = t.Execute(w, *responses)
-	w.Flush()
-	return err
+	return tmpl.Execute(os.Stdout, *responses)
 }