diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-06-15 10:08:34 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2021-06-16 16:53:48 -0700 |
| commit | bd9987239dae148bfd3eea8540d21ae7715faff7 (patch) | |
| tree | 9acb4f44f6d3410d2f7bf78aa9a1621f73bef449 /cmd/podman/inspect | |
| parent | e73a7dadac5a8c74c3a020993de94ed88fd6a04e (diff) | |
| download | podman-bd9987239dae148bfd3eea8540d21ae7715faff7.tar.gz podman-bd9987239dae148bfd3eea8540d21ae7715faff7.tar.bz2 podman-bd9987239dae148bfd3eea8540d21ae7715faff7.zip | |
Scrub podman commands to use report package
Refactor podman commands that have drifted from using
c/common report pkg. Report pkg is needed to implement
go template functions.
Removed obsolete code from podman which exists in c/common.
Latest template library added default newlines and method to
remove them. Incorporated needed changes in c/common PR below.
Depends on https://github.com/containers/common/pull/624
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1855983
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/inspect')
| -rw-r--r-- | cmd/podman/inspect/inspect.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 351684af1..bd3060882 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -7,7 +7,6 @@ import ( "os" "regexp" "strings" - "text/tabwriter" "text/template" "github.com/containers/common/pkg/completion" @@ -217,7 +216,7 @@ func (i *inspector) inspect(namesOrIDs []string) error { err = printJSON(data) default: row := inspectNormalize(i.options.Format) - row = "{{range . }}" + report.NormalizeFormat(row) + "{{end}}" + row = "{{range . }}" + report.NormalizeFormat(row) + "{{end -}}" err = printTmpl(tmpType, row, data) } if err != nil { @@ -250,7 +249,11 @@ func printTmpl(typ, row string, data []interface{}) error { if err != nil { return err } - w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) + + w, err := report.NewWriterDefault(os.Stdout) + if err != nil { + return err + } return t.Execute(w, data) } |