From 61792de36ea2ea98f6e3aef3821d1b15beebf9e0 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Thu, 18 Nov 2021 09:03:00 -0700
Subject: Refactor podman image command output

Leverage new report.Formatter allowing better compatibility from
podman command output.

Follow on PR's will cover containers, etc.

See #10974

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 cmd/podman/images/mount.go | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'cmd/podman/images/mount.go')

diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go
index 89c00cb70..cdeb9eecf 100644
--- a/cmd/podman/images/mount.go
+++ b/cmd/podman/images/mount.go
@@ -87,7 +87,7 @@ func mount(cmd *cobra.Command, args []string) error {
 	case report.IsJSON(mountOpts.Format):
 		return printJSON(reports)
 	case mountOpts.Format == "":
-		break // default format
+		break // see default format below
 	default:
 		return errors.Errorf("unknown --format argument: %q", mountOpts.Format)
 	}
@@ -97,19 +97,12 @@ func mount(cmd *cobra.Command, args []string) error {
 		mrs = append(mrs, mountReporter{r})
 	}
 
-	row := "{{range . }}{{.ID}}\t{{.Path}}\n{{end -}}"
-	tmpl, err := report.NewTemplate("mounts").Parse(row)
+	rpt, err := report.New(os.Stdout, cmd.Name()).Parse(report.OriginPodman, "{{range . }}{{.ID}}\t{{.Path}}\n{{end -}}")
 	if err != nil {
 		return err
 	}
-
-	w, err := report.NewWriterDefault(os.Stdout)
-	if err != nil {
-		return err
-	}
-	defer w.Flush()
-
-	return tmpl.Execute(w, mrs)
+	defer rpt.Flush()
+	return rpt.Execute(mrs)
 }
 
 func printJSON(reports []*entities.ImageMountReport) error {
-- 
cgit v1.2.3-54-g00ecf