fix(config): implement custom string unmarshaler

resolves #210

Author: JanDeDobbeleer

src/config/config.go

@@ -102,7 +102,7 @@ func getRemoteConfig(url string) (*Aliae, error) {
 func parseConfig(data []byte) (*Aliae, error) {
 	var aliae Aliae
 
-	decoder := yaml.NewDecoder(bytes.NewBuffer(data), yaml.CustomUnmarshaler(customUnmarshaler))
+	decoder := yaml.NewDecoder(bytes.NewBuffer(data), yaml.CustomUnmarshaler(aliaeUnmarshaler))
 	err := decoder.Decode(&aliae)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to parse config file: %s", err)

src/config/unmarshal.go

@@ -26,13 +26,13 @@ type StringFunc struct {
 	Name []byte
 }
 
-func customUnmarshaler(a *Aliae, b []byte) error {
+func aliaeUnmarshaler(a *Aliae, b []byte) error {
 	data, err := includeUnmarshaler(b)
 	if err != nil {
 		return err
 	}
 
-	decoder := yaml.NewDecoder(bytes.NewBuffer(data))
+	decoder := yaml.NewDecoder(bytes.NewBuffer(data), yaml.CustomUnmarshaler(templateUmarshaler))
 	if err = decoder.Decode(a); err != nil {
 		return err
 	}

src/config/unmarshal_strings.go

@@ -0,0 +1,46 @@
+package config
+
+import (
+	"bytes"
+	"strings"
+
+	"github.com/goccy/go-yaml"
+	"github.com/jandedobbeleer/aliae/src/shell"
+)
+
+func templateUmarshaler(t *shell.Template, b []byte) error {
+	return stringUmarshaler((*string)(t), b)
+}
+
+func stringUmarshaler(s *string, b []byte) error {
+	if value, OK := unmarshalFoldedBlockScalar(string(b)); OK {
+		*s = value
+		return nil
+	}
+
+	decoder := yaml.NewDecoder(bytes.NewBuffer(b))
+	return decoder.Decode(s)
+}
+
+func unmarshalFoldedBlockScalar(value string) (string, bool) {
+	if !strings.HasPrefix(value, ">") {
+		return value, false
+	}
+
+	lineBreak := "\n"
+	if strings.Contains(value, "\r\n") {
+		lineBreak = "\r\n"
+	}
+
+	value = strings.ReplaceAll(value, ">", "")
+	value = strings.TrimSpace(value)
+	splitted := strings.Split(value, lineBreak)
+
+	for i, line := range splitted {
+		splitted[i] = strings.TrimSpace(line)
+	}
+
+	value = strings.Join(splitted, " ")
+
+	return value, true
+}

src/config/unmarshal_strings_test.go

@@ -0,0 +1,39 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestUnmarshalStrings(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{name: "standard string", input: "test", expected: "test"},
+		{
+			name:     "folded block scalar",
+			expected: "one two three",
+			input: `>
+      one
+	  two
+	  three`,
+		},
+		{
+			name: "literal block scalar",
+			expected: `one
+two`,
+			input: `|
+      one
+      two`,
+		},
+	}
+
+	for _, tc := range tests {
+		var result string
+		_ = stringUmarshaler(&result, []byte(tc.input))
+		assert.Equal(t, tc.expected, result)
+	}
+}