Remove trim and trailing message newline in data

Now there is no need to trim it, when the data is changed.

    {{.Name}}{{"\n"}}{{.Message | missing "<no message>" | indent 2}}

Make the prefix function not append a newline, if not there.

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/store/instance.go

@@ -285,6 +285,7 @@ func PrintInstances(w io.Writer, instances []*Instance, format string) error {
 		if err != nil {
 			return err
 		}
+		data.Message = strings.TrimSuffix(instance.Message, "\n")
 		err = tmpl.Execute(w, data)
 		if err != nil {
 			return err

pkg/textutil/textutil.go

@@ -25,14 +25,15 @@ func ExecuteTemplate(tmpl string, args interface{}) ([]byte, error) {
 
 // PrefixString adds prefix to beginning of each line
 func PrefixString(prefix string, text string) string {
-	result := ""
+	result := []string{}
 	for _, line := range strings.Split(text, "\n") {
 		if line == "" {
+			result = append(result, "")
 			continue
 		}
-		result += prefix + line + "\n"
+		result = append(result, prefix+line)
 	}
-	return result
+	return strings.Join(result, "\n")
 }
 
 // IndentString add spaces to beginning of each line
@@ -74,13 +75,11 @@ var TemplateFuncMap = template.FuncMap{
 		return "---\n" + strings.TrimSuffix(b.String(), "\n")
 	},
 	"indent":  IndentString,
-	"trim":    TrimString,
 	"missing": MissingString,
 }
 
 // TemplateFuncHelp is help for TemplateFuncMap.
 var FuncHelp = []string{
 	"indent <size>: add spaces to beginning of each line",
-	"trim <cutset>: remove characters from beginning and end",
 	"missing <message>: return message if the text is empty",
 }

pkg/textutil/textutil_test.go

@@ -9,11 +9,11 @@ import (
 )
 
 func TestPrefixString(t *testing.T) {
-	assert.Equal(t, "- foo\n", PrefixString("- ", "foo"))
+	assert.Equal(t, "- foo", PrefixString("- ", "foo"))
 	assert.Equal(t, "- foo\n- bar\n", PrefixString("- ", "foo\nbar\n"))
 }
 func TestIndentString(t *testing.T) {
-	assert.Equal(t, "  foo\n", IndentString(2, "foo"))
+	assert.Equal(t, "  foo", IndentString(2, "foo"))
 	assert.Equal(t, "  foo\n  bar\n", IndentString(2, "foo\nbar\n"))
 }
 
@@ -33,18 +33,18 @@ func TestTemplateFuncs(t *testing.T) {
 		Bar     string `json:"bar" yaml:"bar"`
 		Message string `json:"message,omitempty" yaml:"message,omitempty"`
 	}
-	x := X{Foo: 42, Bar: "hello", Message: "One\nTwo\nThree\n"}
+	x := X{Foo: 42, Bar: "hello", Message: "One\nTwo\nThree"}
 
 	testCases := map[string]string{
-		"{{json .}}": `{"foo":42,"bar":"hello","message":"One\nTwo\nThree\n"}`,
+		"{{json .}}": `{"foo":42,"bar":"hello","message":"One\nTwo\nThree"}`,
 		"{{yaml .}}": `---
 foo: 42
 bar: hello
-message: |
+message: |-
   One
   Two
   Three`,
-		`{{.Bar}}{{"\n"}}{{.Message | missing "<no message>" | indent 2 | trim "\n"}}`: "hello\n  One\n  Two\n  Three",
+		`{{.Bar}}{{"\n"}}{{.Message | missing "<no message>" | indent 2}}`: "hello\n  One\n  Two\n  Three",
 	}
 
 	for format, expected := range testCases {