diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-06-15 10:08:34 -0700 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-06-25 09:33:06 -0400 |
| commit | 5dabff27db83a0bdbea0e736050f5e3cb2c1d95e (patch) | |
| tree | 401d590ad7d739a543c99486ddbe6105597cf272 /cmd/podman/volumes/list.go | |
| parent | 647c2024e24abdab28480ec2f99bddb4a0a5a6d0 (diff) | |
| download | podman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.tar.gz podman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.tar.bz2 podman-5dabff27db83a0bdbea0e736050f5e3cb2c1d95e.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>
<MH: Fixed cherry-pick conflicts>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd/podman/volumes/list.go')
| -rw-r--r-- | cmd/podman/volumes/list.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index f402afa94..621ea6089 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -5,13 +5,10 @@ import ( "fmt" "os" "strings" - "text/tabwriter" - "text/template" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/podman/v3/cmd/podman/common" - "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/libpod/define" @@ -105,13 +102,17 @@ func outputTemplate(cmd *cobra.Command, responses []*entities.VolumeListReport) if cliOpts.Quiet { row = "{{.Name}}\n" } - format := parse.EnforceRange(row) + format := report.EnforceRange(row) - tmpl, err := template.New("list volume").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 !(noHeading || cliOpts.Quiet || cmd.Flag("format").Changed) { |