summaryrefslogtreecommitdiff
path: root/cmd/podman/system/version.go
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-10 15:22:39 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-10 15:44:17 +0200
commitbb9d939155c2ce37654abd58a71f650bde6bce50 (patch)
treef8b63a675fb0a7856f816eb982ab4dcf1e042bd7 /cmd/podman/system/version.go
parent2ac8c6953481eb7391a6a7594709811f7ae3167f (diff)
downloadpodman-bb9d939155c2ce37654abd58a71f650bde6bce50.tar.gz
podman-bb9d939155c2ce37654abd58a71f650bde6bce50.tar.bz2
podman-bb9d939155c2ce37654abd58a71f650bde6bce50.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.go3
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