Fix the combination of "table " and \n in report formats

Completely skipping the NormalizeFormat part also skipped the removal of the "table " directive. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Feb 27, 2023 · de4859a · de4859a
1 parent 8c2a86b
commit de4859a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pkg/report/formatter.go b/pkg/report/formatter.go
@@ -49,6 +49,15 @@ type Formatter struct {
 	writer        io.Writer          // Destination for formatted output
 }
 
+// stringsCutPrefix is equivalent to Go 1.20’s strings.CutPrefix.
+// Replace this function with a direct call to the standard library after we update to Go 1.20.
+func stringsCutPrefix(s, prefix string) (string, bool) {
+	if !strings.HasPrefix(s, prefix) {
+		return s, false
+	}
+	return s[len(prefix):], true
+}
+
 // Parse parses golang template returning a formatter
 //
 //   - OriginPodman implies text is a template from podman code. Output will
@@ -64,11 +73,12 @@ func (f *Formatter) Parse(origin Origin, text string) (*Formatter, error) {
 	// To be backwards compatible with the previous behavior we try to replace and
 	// parse the template. If it fails use the original text and parse again.
 	var normText string
+	textWithoutTable, hasTable := stringsCutPrefix(text, "table ")
 	switch {
-	case strings.HasPrefix(text, "table "):
+	case hasTable:
 		f.RenderTable = true
 		normText = "{{range .}}" + NormalizeFormat(text) + "{{end -}}"
-		text = "{{range .}}" + text + "{{end -}}"
+		text = "{{range .}}" + textWithoutTable + "{{end -}}"
 	case OriginUser == origin:
 		normText = EnforceRange(NormalizeFormat(text))
 		text = EnforceRange(text)

diff --git a/pkg/report/formatter_test.go b/pkg/report/formatter_test.go
@@ -84,6 +84,7 @@ func TestFormatter_ParseTable(t *testing.T) {
 		{&bytes.Buffer{}, OriginUser, `{{range .}}{{.ID}}{{end -}}`, "c061a0839ef10fc2e110571eb6fab5aa8f4b5cbfd3e66aa35e9b2a"},
 		// regression test for https://bugzilla.redhat.com/show_bug.cgi?id=2059658 and https://github.com/containers/podman/issues/13446
 		{&bytes.Buffer{}, OriginUser, `{{range .}}{{printf "\n"}}{{end -}}`, "\n\n\n"},
+		{&tabwriter.Writer{}, OriginUser, `table {{printf "\n"}}`, "\n\n\n\n"},
 	}
 
 	for loop, tc := range testCase {