diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-21 17:59:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 17:59:56 -0400 |
| commit | 2bd920b00540280696d19dc95ab6e562aebd6b7d (patch) | |
| tree | 76e7bd0ff448253d4d4ec23f41865297161a973b /cmd/podman/system | |
| parent | 61b276a05c1c8adc51c6d4f7c061b89ce39a803b (diff) | |
| parent | bab3cda0e81fa3ac3315601f5ec17724f3ad8ed5 (diff) | |
| download | podman-2bd920b00540280696d19dc95ab6e562aebd6b7d.tar.gz podman-2bd920b00540280696d19dc95ab6e562aebd6b7d.tar.bz2 podman-2bd920b00540280696d19dc95ab6e562aebd6b7d.zip | |
Merge pull request #8077 from jwhonce/wip/report
Refactor podman to use c/common/pkg/report
Diffstat (limited to 'cmd/podman/system')
| -rw-r--r-- | cmd/podman/system/df.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/events.go | 4 | ||||
| -rw-r--r-- | cmd/podman/system/info.go | 4 | ||||
| -rw-r--r-- | cmd/podman/system/version.go | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index 63c80a8d9..b11167938 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -8,8 +8,8 @@ import ( "text/template" "time" + "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/docker/go-units" diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index 3f3fbc340..368cd41a6 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -6,7 +6,7 @@ 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/validate" "github.com/containers/podman/v2/libpod/events" @@ -65,7 +65,7 @@ func eventsCmd(cmd *cobra.Command, _ []string) error { ) if cmd.Flags().Changed("format") { - doJSON = parse.MatchesJSONFormat(eventFormat) + doJSON = report.IsJSON(eventFormat) if !doJSON { var err error tmpl, err = template.New("events").Parse(eventFormat) diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index b84bdc51a..dece6b37e 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -5,7 +5,7 @@ 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/validate" "github.com/containers/podman/v2/pkg/domain/entities" @@ -70,7 +70,7 @@ func info(cmd *cobra.Command, args []string) error { } switch { - case parse.MatchesJSONFormat(inFormat): + case report.IsJSON(inFormat): b, err := json.MarshalIndent(info, "", " ") if err != nil { return err diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 5a5686744..b790a7511 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.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/libpod/define" "github.com/containers/podman/v2/pkg/domain/entities" @@ -42,7 +41,7 @@ func version(cmd *cobra.Command, args []string) error { return err } - if parse.MatchesJSONFormat(versionFormat) { + if report.IsJSON(versionFormat) { s, err := json.MarshalToString(versions) if err != nil { return err |