Merge pull request #1663 from simonbaird/text-output-image-ref-wrap-tweak

Don't wrap image ref in text output

Author: simonbaird

internal/applicationsnapshot/templates/_results.tmpl

@@ -16,7 +16,7 @@
     {{- colorIndicator $type }} {{ colorText $type (printf "[%s] %s" $type .Metadata.code) }}{{ nl -}}
 
     {{- if $imageRef -}}
-      {{- indentWrap $indent $wrap (printf "ImageRef: %s" $imageRef ) }}{{ nl -}}
+      {{- indent $indent (printf "ImageRef: %s" $imageRef ) }}{{ nl -}}
     {{- end -}}
 
     {{/* For a success the message is generally just "Pass" so don't show it */}}

internal/utils/templates.go

@@ -125,10 +125,19 @@ func wrap(width int, s string) string {
 	return wordwrap.WrapString(s, uint(width))
 }
 
+// A string with n spaces
+func indentStr(n int) string {
+	return strings.Repeat(" ", n)
+}
+
+// Indent a certain number of spaces
+func indent(n int, s string) string {
+	return indentStr(n) + s
+}
+
 // Indent with spaces and also wrap
-func indentWrap(indent int, width int, s string) string {
-	indentStr := strings.Repeat(" ", indent)
-	return indentStr + strings.ReplaceAll(wrap(width-indent, s), "\n", "\n"+indentStr)
+func indentWrap(n int, width int, s string) string {
+	return indent(n, strings.ReplaceAll(wrap(width-n, s), "\n", "\n"+indentStr(n)))
 }
 
 // A way to assemble a map from keys and values in a template
@@ -148,8 +157,8 @@ func toMap(values ...interface{}) (map[string]interface{}, error) {
 }
 
 // Can make it easier to get the right number of line breaks
-func nl() (string, error) {
-	return "\n", nil
+func nl() string {
+	return "\n"
 }
 
 // For use in template.Funcs above
@@ -159,6 +168,7 @@ var templateHelpers = template.FuncMap{
 	"indicator":      indicator,
 	"colorIndicator": colorIndicator,
 	"wrap":           wrap,
+	"indent":         indent,
 	"indentWrap":     indentWrap,
 	"toMap":          toMap,
 	"nl":             nl,