summaryrefslogtreecommitdiff
path: root/cmd/podman/parse/json.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/parse/json.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/parse/json.go')
-rw-r--r--cmd/podman/parse/json.go9
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))
+}