diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-10-20 10:29:49 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-10-21 08:16:52 -0700 |
| commit | bab3cda0e81fa3ac3315601f5ec17724f3ad8ed5 (patch) | |
| tree | 14ad37445fe86fc55db7907d657f40f0027d92b8 /cmd/podman/volumes | |
| parent | f96dbd0896eac8730142cf694485543275764195 (diff) | |
| download | podman-bab3cda0e81fa3ac3315601f5ec17724f3ad8ed5.tar.gz podman-bab3cda0e81fa3ac3315601f5ec17724f3ad8ed5.tar.bz2 podman-bab3cda0e81fa3ac3315601f5ec17724f3ad8ed5.zip | |
Refactor podman to use c/common/pkg/report
All formatting for containers stack moved into one package
The does not correct issue with headers when using custom tables
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/volumes')
| -rw-r--r-- | cmd/podman/volumes/inspect.go | 5 | ||||
| -rw-r--r-- | cmd/podman/volumes/list.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index 8d1350228..ece1e31ce 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -5,9 +5,8 @@ import ( "os" "text/template" - "github.com/containers/podman/v2/cmd/podman/parse" + "github.com/containers/common/pkg/report" "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/report" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -55,7 +54,7 @@ func inspect(cmd *cobra.Command, args []string) error { } switch { - case parse.MatchesJSONFormat(inspectFormat), inspectFormat == "": + case report.IsJSON(inspectFormat), inspectFormat == "": jsonOut, err := json.MarshalIndent(responses, "", " ") if err != nil { return errors.Wrapf(err, "error marshalling inspect JSON") diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 18765a499..0a308ec47 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -8,9 +8,8 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/podman/v2/cmd/podman/parse" + "github.com/containers/common/pkg/report" "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/report" "github.com/containers/podman/v2/cmd/podman/validate" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" @@ -75,7 +74,7 @@ func list(cmd *cobra.Command, args []string) error { } switch { - case parse.MatchesJSONFormat(cliOpts.Format): + case report.IsJSON(cliOpts.Format): return outputJSON(responses) case len(responses) < 1: return nil |