diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-07-10 15:22:39 +0200 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-22 14:42:53 -0400 |
| commit | 1fb32b9b2f1196f02fdd0aba8f55e18684e9e932 (patch) | |
| tree | 263edeba3b047d2614bdbf1e724dd7d6ff58b6f3 /cmd/podman/system/version.go | |
| parent | ce829a2a8436cc621c0a9ea66b5856df02473212 (diff) | |
| download | podman-1fb32b9b2f1196f02fdd0aba8f55e18684e9e932.tar.gz podman-1fb32b9b2f1196f02fdd0aba8f55e18684e9e932.tar.bz2 podman-1fb32b9b2f1196f02fdd0aba8f55e18684e9e932.zip | |
version/info: format: allow more json variants
Allow more variants to yield json output for `podman version` and
`podman info`. Instead of comparing strings, use a regex and add
unit and e2e tests.
Fixes: #6927
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd/podman/system/version.go')
| -rw-r--r-- | cmd/podman/system/version.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 5aac34699..9b70bc9f4 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -8,6 +8,7 @@ import ( "text/tabwriter" "github.com/containers/buildah/pkg/formats" + "github.com/containers/libpod/v2/cmd/podman/parse" "github.com/containers/libpod/v2/cmd/podman/registry" "github.com/containers/libpod/v2/cmd/podman/validate" "github.com/containers/libpod/v2/libpod/define" @@ -41,7 +42,7 @@ func version(cmd *cobra.Command, args []string) error { } switch { - case versionFormat == "json", versionFormat == "{{ json .}}": + case parse.MatchesJSONFormat(versionFormat): s, err := json.MarshalToString(versions) if err != nil { return err |