🐛 (flags): Fix error when value starts or ends with a newline

clevyr · Feb 22, 2023 · 6552d3d · 6552d3d
1 parent 049e664
commit 6552d3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/util/flags.go b/internal/util/flags.go
@@ -15,7 +15,10 @@ func FixStringToStringNewlines(s []string) []string {
 			replaceNext = false
 			if strings.ContainsRune(arg, '=') {
 				if strings.ContainsRune(arg, '\n') {
-					s[i] = strings.ReplaceAll(arg, "\n", ",")
+					arg = strings.ReplaceAll(arg, "\n", ",")
+					arg = strings.Trim(arg, ",")
+					arg = strings.Replace(arg, "=,", "=", 1)
+					s[i] = arg
 				}
 			} else {
 				replaceNext = true

diff --git a/internal/util/flags_test.go b/internal/util/flags_test.go
@@ -20,6 +20,7 @@ func TestFixStringToStringNewlines(t *testing.T) {
 		{"newline with space", args{[]string{"yampl", "--value", "a=a\nb=b"}}, []string{"yampl", "--value", "a=a,b=b"}},
 		{"newline in file", args{[]string{"yampl", "test\nfile.yaml"}}, []string{"yampl", "test\nfile.yaml"}},
 		{"newline after end of options", args{[]string{"yampl", "-v=a=a", "---", "-v\nfile.yaml"}}, []string{"yampl", "-v=a=a", "---", "-v\nfile.yaml"}},
+		{"trim newline", args{[]string{"yampl", "-v=\na=a\n"}}, []string{"yampl", "-v=a=a"}},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {