pkg/report: fix IsJSON() #2

The PR containers#1226 was merged to soon, it breaks podman tests and backwards compat. `{{json}}` and `{{json.}}` are not valid templates but it worked before the same as `json` so we should keep that for compat reasons. Fixes up commit 152c840 Signed-off-by: Paul Holzinger <[email protected]>
Luap99 · Nov 8, 2022 · ed6b992 · ed6b992
1 parent bf9e18b
commit ed6b992
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/pkg/report/validate.go b/pkg/report/validate.go
@@ -1,12 +1,18 @@
 package report
 
-import "strings"
+import (
+	"regexp"
+)
+
+// Check for json, {{json }} and {{ json. }} which are not valid go template,
+// {{json .}} is valid and thus not matched to let the template handle it like docker does.
+var jsonRegex = regexp.MustCompile(`^\s*(json|{{\s*json\.?\s*}})\s*$`)
 
 // JSONFormat test CLI --format string to be a JSON request
 //
 //	if report.IsJSON(cmd.Flag("format").Value.String()) {
 //	  ... process JSON and output
 //	}
 func IsJSON(s string) bool {
-	return strings.TrimSpace(s) == "json"
+	return jsonRegex.MatchString(s)
 }
diff --git a/pkg/report/validate_test.go b/pkg/report/validate_test.go
@@ -17,9 +17,12 @@ func TestIsJSON(t *testing.T) {
 		{" json", true},
 		{" json ", true},
 		{"  json   ", true},
-		{"{{json}}", false},
-		{"{{json }}", false},
-		{"{{json .}}", false},
+		// special case, previous regex allowed this template string but it is not actually a valid template
+		{"{{json}}", true},
+		{"{{json }}", true},
+		{"{{json.}}", true},
+		{"{{ json. }}", true},
+
 		{"{{ json .}}", false},
 		{"{{ json . }}", false},
 		{"  {{   json   .  }}  ", false},