fix: escape char (#14)

introduced more TERMINATING_CHARS and fixed #13

Author: dnitsch

configmanager.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	TERMINATING_CHAR string = `[^\'\"\s\n]`
+	TERMINATING_CHAR string = `[^\'\"\s\n\\]`
 )
 
 type ConfigManager struct{}
@@ -41,13 +41,8 @@ func (c *ConfigManager) RetrieveWithInputReplaced(input string, config generator
 }
 
 func retrieveWithInputReplaced(input string, gv GenerateAPI) (string, error) {
-	tokens := []string{}
-	for k := range generator.VarPrefix {
-		matches := regexp.MustCompile(`(?s)`+regexp.QuoteMeta(string(k))+`.(`+TERMINATING_CHAR+`+)`).FindAllString(input, -1)
-		tokens = append(tokens, matches...)
-	}
 
-	m, err := retrieve(tokens, gv)
+	m, err := retrieve(FindTokens(input), gv)
 
 	if err != nil {
 		return "", err
@@ -56,6 +51,17 @@ func retrieveWithInputReplaced(input string, gv GenerateAPI) (string, error) {
 	return replaceString(m, input), nil
 }
 
+// FindTokens extracts all replaceable tokens
+// from a given input string
+func FindTokens(input string) []string {
+	tokens := []string{}
+	for k := range generator.VarPrefix {
+		matches := regexp.MustCompile(`(?s)`+regexp.QuoteMeta(string(k))+`.(`+TERMINATING_CHAR+`+)`).FindAllString(input, -1)
+		tokens = append(tokens, matches...)
+	}
+	return tokens
+}
+
 // replaceString fills tokens in a provided input with their actual secret/config values
 func replaceString(inputMap generator.ParsedMap, inputString string) string {
 

configmanager_test.go

@@ -76,29 +76,6 @@ func Test_retrieve(t *testing.T) {
 }
 
 var (
-	strT1 = `
-space: preserved
-	indents: preserved
-	arr: [ "FOO#/test" ]
-	// comments preserved
-	arr:
-		- "FOO#/test"
-`
-	strT2 = `
-// TOML
-[[somestuff]]
-key = "FOO#/test" 
-`
-
-	strT3 = `
-// TOML
-[[somestuff]]
-key = FOO#/test
-key2 = FOO#/test
-key3 = FOO#/test
-key4 = FOO#/test
-`
-
 	strT4 = `
 export FOO='FOO#/test'
 export FOO1=FOO#/test
@@ -113,15 +90,21 @@ foo23 = FOO#/test
 )
 
 func Test_retrieveWithInputReplaced(t *testing.T) {
-	tests := []struct {
+	tests := map[string]struct {
 		name   string
 		input  string
 		genvar generator.Generatoriface
 		expect string
 	}{
-		{
-			name:   "strYaml",
-			input:  strT1,
+		"strYaml": {
+			input: `
+space: preserved
+	indents: preserved
+	arr: [ "FOO#/test" ]
+	// comments preserved
+	arr:
+		- "FOO#/test"
+`,
 			genvar: &mockGenVars{},
 			expect: `
 space: preserved
@@ -132,19 +115,28 @@ space: preserved
 		- "val1"
 `,
 		},
-		{
-			name:   "strToml",
-			input:  strT2,
+		"strToml": {
+			input: `
+// TOML
+[[somestuff]]
+key = "FOO#/test" 
+`,
 			genvar: &mockGenVars{},
 			expect: `
 // TOML
 [[somestuff]]
 key = "val1" 
 `,
 		},
-		{
-			name:   "strTomlWithoutQuotes",
-			input:  strT3,
+		"strTomlWithoutQuotes": {
+			input: `
+// TOML
+[[somestuff]]
+key = FOO#/test
+key2 = FOO#/test
+key3 = FOO#/test
+key4 = FOO#/test
+`,
 			genvar: &mockGenVars{},
 			expect: `
 // TOML
@@ -155,14 +147,23 @@ key3 = val1
 key4 = val1
 `,
 		},
-		{
-			name:   "strTomlWithoutMultiline",
-			input:  strT4,
+		"strTomlWithoutMultiline": {
+			input: `
+export FOO='FOO#/test'
+export FOO1=FOO#/test
+export FOO2="FOO#/test"
+export FOO3=FOO#/test
+export FOO4=FOO#/test
+
+[[section]]
+
+foo23 = FOO#/test
+`,
 			genvar: &mockGenVars{},
 			expect: `
 export FOO='val1'
 export FOO1=val1
-export FOO2='val1'
+export FOO2="val1"
 export FOO3=val1
 export FOO4=val1
 
@@ -171,6 +172,11 @@ export FOO4=val1
 foo23 = val1
 `,
 		},
+		"escaped input": {
+			input:  `"{\"patchPayloadTemplate\":\"{\\\"password\\\":\\\"FOO#/test\\\",\\\"passwordConfirm\\\":\\\"FOO#/test\\\"}\\n\"}"`,
+			genvar: &mockGenVars{},
+			expect: `"{\"patchPayloadTemplate\":\"{\\\"password\\\":\\\"val1\\\",\\\"passwordConfirm\\\":\\\"val1\\\"}\\n\"}"`,
+		},
 	}
 
 	for _, tt := range tests {