diff options
author | Jhon Honce <jhonce@redhat.com> | 2021-11-18 09:03:00 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2021-12-02 09:07:27 -0700 |
commit | 61792de36ea2ea98f6e3aef3821d1b15beebf9e0 (patch) | |
tree | f2e73122b2cdb0323e1d38792eef44a625b85d10 /cmd/podman/pods/stats.go | |
parent | fbcebcb46a2444ce078dee10d8d51555bee8f177 (diff) | |
download | podman-61792de36ea2ea98f6e3aef3821d1b15beebf9e0.tar.gz podman-61792de36ea2ea98f6e3aef3821d1b15beebf9e0.tar.bz2 podman-61792de36ea2ea98f6e3aef3821d1b15beebf9e0.zip |
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>
Diffstat (limited to 'cmd/podman/pods/stats.go')
-rw-r--r-- | cmd/podman/pods/stats.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index ba2c1495b..a7bba3064 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -67,9 +67,7 @@ func stats(cmd *cobra.Command, args []string) error { return err } - row := report.NormalizeFormat(statsOptions.Format) - doJSON := report.IsJSON(row) - + doJSON := report.IsJSON(cmd.Flag("format").Value.String()) headers := report.Headers(entities.PodStatsReport{}, map[string]string{ "CPU": "CPU %", "MemUsage": "MEM USAGE/ LIMIT", @@ -96,6 +94,8 @@ func stats(cmd *cobra.Command, args []string) error { goterm.Flush() } if cmd.Flags().Changed("format") { + row := report.NormalizeFormat(statsOptions.Format) + row = report.EnforceRange(row) if err := printFormattedPodStatsLines(headers, row, reports); err != nil { return err } @@ -143,8 +143,6 @@ func printFormattedPodStatsLines(headerNames []map[string]string, row string, st return nil } - row = report.EnforceRange(row) - tmpl, err := report.NewTemplate("stats").Parse(row) if err != nil { return err |