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/parse/json.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/parse/json.go')
-rw-r--r-- | cmd/podman/parse/json.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmd/podman/parse/json.go b/cmd/podman/parse/json.go new file mode 100644 index 000000000..95a6633b8 --- /dev/null +++ b/cmd/podman/parse/json.go @@ -0,0 +1,9 @@ +package parse + +import "regexp" + +var jsonFormatRegex = regexp.MustCompile(`^(\s*json\s*|\s*{{\s*json\s*\.\s*}}\s*)$`) + +func MatchesJSONFormat(s string) bool { + return jsonFormatRegex.Match([]byte(s)) +} |