Add spaces support

uber-go · Mar 8, 2017 · 8671b02 · 8671b02
1 parent e3768e6
commit 8671b02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/yaml.go b/config/yaml.go
@@ -327,7 +327,7 @@ func unmarshalYAMLValue(reader io.ReadCloser, value interface{}) error {
 // TODO: what if someone wanted a literal ${FOO} in config? need a small escape hatch
 func interpolateEnvVars(data []byte) ([]byte, error) {
 	// ${VAR_NAME:default} or ${VAR_NAME}
-	reg := regexp.MustCompile(`\$\{\w+:?[\w"]*}`)
+	reg := regexp.MustCompile(`\$\{\w+:?[^}]*}`)
 
 	var regErr error
 	data = reg.ReplaceAllFunc(data, func(in []byte) []byte {

diff --git a/config/yaml_test.go b/config/yaml_test.go
@@ -105,11 +105,11 @@ func TestYAMLEnvInterpolationEmptyString(t *testing.T) {
 	t.Parallel()
 
 	cfg := []byte(`
-name: ""
+name: ${APP_NAME:my shiny app}
 fullTel: 1-800-LOLZ${TELEPHONE_EXTENSION:""}`)
 
 	p := NewYAMLProviderFromBytes(cfg)
-	require.Equal(t, "", p.Get("name").AsString())
+	require.Equal(t, "my shiny app", p.Get("name").AsString())
 	require.Equal(t, "1-800-LOLZ", p.Get("fullTel").AsString())
 }