Merge pull request #616 from surajssd/default-value-token

Default value having colon can be parsed now

pkg/cmd/util.go

@@ -162,14 +162,16 @@ func replaceWithEnv(in []byte) []byte {
 	var found bool
 	// Splitting string with separator ":"
 	slice := strings.Split(name, ":")
-	// if slice has 2 elements, i.e given variable has default value
-	if len(slice) == 2 {
+	// if slice has 2 or more elements, i.e given variable has default value
+	// there could be more than two elements when the default value has one or
+	// more colons
+	if len(slice) >= 2 {
 		name = strings.TrimSpace(slice[0])
 		// look into environment for the value
 		value, found = os.LookupEnv(name)
 		// put default value if it's not present in environment
 		if !found && value == "" {
-			value = strings.TrimSpace(slice[1])
+			value = strings.TrimSpace(strings.Join(slice[1:], ":"))
 		}
 	} else {
 		// default value is not provided

pkg/cmd/util_test.go

@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -136,16 +137,17 @@ func TestReplaceWithEnv(t *testing.T) {
 }
 
 func TestSubstituteVariables(t *testing.T) {
-	err := os.Setenv("TEST_IMAGE_TAG", "version")
-	if err != nil {
-		t.Error(err)
-		t.FailNow()
+	envs := map[string]string{
+		"TEST_IMAGE_TAG":    "version",
+		"TEST_SERVICE_NAME": "name",
+		"WEB_APP_URL":       "webapp:8080",
 	}
-
-	err = os.Setenv("TEST_SERVICE_NAME", "name")
-	if err != nil {
-		t.Error(err)
-		t.FailNow()
+	for k, v := range envs {
+		err := os.Setenv(k, v)
+		if err != nil {
+			t.Error(fmt.Errorf("error setting environment variable, %s=%s: %v", k, v, err))
+			t.FailNow()
+		}
 	}
 
 	tests := []struct {
@@ -276,6 +278,46 @@ func TestSubstituteVariables(t *testing.T) {
 				`),
 			false,
 		},
+		{
+			"Default value has colon",
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:version
+				  env:
+				  - name: APP_URL
+				    value: [[ APP_URL:app:8080 ]]
+			`),
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:version
+				  env:
+				  - name: APP_URL
+				    value: app:8080
+			`),
+			false,
+		},
+		{
+			"Default value has colon but variable is exported in environment",
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:version
+				  env:
+				  - name: APP_URL
+				    value: [[ WEB_APP_URL:app:8080 ]]
+			`),
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:version
+				  env:
+				  - name: APP_URL
+				    value: webapp:8080
+			`),
+			false,
+		},
 	}
 
 	for _, test := range tests {