Merge pull request #1226 from Luap99/format-json

pkg/report: fix IsJSON()
containers · Nov 8, 2022 · bf9e18b · bf9e18b
2 parents 627a7c3 + 152c840
commit bf9e18b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/pkg/report/validate.go b/pkg/report/validate.go
@@ -1,14 +1,12 @@
 package report
 
-import "regexp"
-
-var jsonRegex = regexp.MustCompile(`^\s*(json|{{\s*json\s*(\.)?\s*}})\s*$`)
+import "strings"
 
 // 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 jsonRegex.MatchString(s)
+	return strings.TrimSpace(s) == "json"
 }
diff --git a/pkg/report/validate_test.go b/pkg/report/validate_test.go
@@ -17,17 +17,16 @@ func TestIsJSON(t *testing.T) {
 		{" json", true},
 		{" json ", true},
 		{"  json   ", true},
-		{"{{json}}", true},
-		{"{{json }}", true},
-		{"{{json .}}", true},
-		{"{{ json .}}", true},
-		{"{{ json . }}", true},
-		{"  {{   json   .  }}  ", true},
+		{"{{json}}", false},
+		{"{{json }}", false},
+		{"{{json .}}", false},
+		{"{{ json .}}", false},
+		{"{{ json . }}", false},
+		{"  {{   json   .  }}  ", false},
 		{"{{ json .", false},
 		{"json . }}", false},
 		{"{{.ID }} json .", false},
 		{"json .", false},
-		{"{{json.}}", true},
 	}
 
 	for _, tc := range tests {