Merge pull request #18 from k1LoW/fix-handling-env-placeholder

expand_test.go

@@ -110,12 +110,29 @@ multi: |
   current.url == 'https://example.com/#about'
 
 `},
+		{
+			`key: "hello$"`,
+			map[string]string{},
+			`key: "hello$"
+`,
+		},
+		{
+			`key: "hello$ ${WORLD}"`,
+			map[string]string{
+				"WORLD": "world",
+			},
+			`key: "hello$ world"
+`,
+		},
 	}
 	for _, tt := range tests {
 		for k, v := range tt.envs {
 			t.Setenv(k, v)
 		}
-		got := ExpandYAML(tt.in, os.LookupEnv)
+		mapper := func(in string) (string, bool) {
+			return os.LookupEnv(in)
+		}
+		got := ExpandYAML(tt.in, mapper)
 		if got != tt.want {
 			t.Errorf("got\n%v\nwant\n%v", got, tt.want)
 		}

repfn.go

@@ -13,14 +13,22 @@ import (
 
 type repFn func(in string) (string, error)
 
+var envPlaceholderRe = regexp.MustCompile(`\${.+}`)
+
 func InterpolateRepFn(mapping func(string) (string, bool)) repFn {
 	mapper := Mapper{mapping: mapping}
 	return func(in string) (string, error) {
-		replace, err := interpolate.Interpolate(mapper, in)
+		if !envPlaceholderRe.MatchString(in) {
+			return in, nil
+		}
+		r := strings.NewReplacer("${", "${", "$", "__NOT_INTERPOLATE_START__")
+		rr := strings.NewReplacer("__NOT_INTERPOLATE_START__", "$")
+
+		replace, err := interpolate.Interpolate(mapper, r.Replace(in))
 		if err != nil {
 			return in, err
 		}
-		return replace, nil
+		return rr.Replace(replace), nil
 	}
 }