Merge pull request #87 from hori-ryota/feature/fix-defaultvariablepat…

…tern Fix defaultVariablePattern for period
openfresh · Aug 3, 2016 · 2151768 · 2151768
2 parents 2954fb5 + 05dca01
commit 2151768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/util/util.go b/util/util.go
@@ -14,7 +14,7 @@ import (
 var (
 	keyValuePattern        = regexp.MustCompile(`^\s*(.+)\s*=\s*(.+)\s*$`)
 	variablePattern        = regexp.MustCompile(`\$\{([\w_-]+)\}`)
-	defaultVariablePattern = regexp.MustCompile(`\$\{([\w_-]+)\s*\|\s*([\w_-]+)\}`)
+	defaultVariablePattern = regexp.MustCompile(`\$\{([\w_-]+)\s*\|\s*([\w._-]+)\}`)
 )
 
 func StringValueWithIndent(value interface{}, indent int) string {

diff --git a/util/util_test.go b/util/util_test.go
@@ -90,7 +90,7 @@ func TestMergeYamlWithDefaultParameters(t *testing.T) {
 
 	yaml := `
 	nginx:
-		image: stormcat24/nginx:${NGINX_VERSION|feature}
+		image: stormcat24/nginx:${NGINX_VERSION|default-_4.9}
 		ports:
 			- 80:${NGINX_PORT|80}
 		environment:
@@ -99,7 +99,7 @@ func TestMergeYamlWithDefaultParameters(t *testing.T) {
 
 	expect := `
 	nginx:
-		image: stormcat24/nginx:feature
+		image: stormcat24/nginx:default-_4.9
 		ports:
 			- 80:8080
 		environment: