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/system/connection/list.go | |
| 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/system/connection/list.go')
| -rw-r--r-- | cmd/podman/system/connection/list.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index ae88b0b30..b0b15b57d 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -2,11 +2,10 @@ package connection import ( "os" - "text/tabwriter" - "text/template" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" + "github.com/containers/common/pkg/report" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/system" "github.com/containers/podman/v3/cmd/podman/validate" @@ -73,13 +72,16 @@ func list(_ *cobra.Command, _ []string) error { } // TODO: Allow user to override format - format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}" - tmpl, err := template.New("connection").Parse(format) + format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end -}}" + tmpl, err := report.NewTemplate("list").Parse(format) 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 + } defer w.Flush() _ = tmpl.Execute(w, hdrs) |