Merge pull request #1227 from Luap99/format-json2

pkg/report: fix IsJSON() #2

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)
 }

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},