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/machine | |
| 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/machine')
| -rw-r--r-- | cmd/podman/machine/list.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index 77b47161a..134a081ab 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -5,14 +5,11 @@ package machine import ( "os" "sort" - "text/tabwriter" - "text/template" "time" "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/parse" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/validate" "github.com/containers/podman/v3/pkg/machine" @@ -93,16 +90,20 @@ func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error { }) row := report.NormalizeFormat(listFlag.format) - format := parse.EnforceRange(row) + format := report.EnforceRange(row) - tmpl, err := template.New("list machines").Parse(format) + tmpl, err := report.NewTemplate("list").Parse(format) + if err != nil { + return err + } + + w, err := report.NewWriterDefault(os.Stdout) if err != nil { return err } - w := tabwriter.NewWriter(os.Stdout, 12, 2, 2, ' ', 0) defer w.Flush() - if cmd.Flags().Changed("format") && !parse.HasTable(listFlag.format) { + if cmd.Flags().Changed("format") && !report.HasTable(listFlag.format) { listFlag.noHeading = true } |