Merge pull request #612 from surajssd/env-lookup-trimspace

Trim whitespaces before env lookup
kedgeproject · Mar 8, 2018 · ba2dad0 · ba2dad0
2 parents 965e40b + d33cd6d
commit ba2dad0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
@@ -164,7 +164,7 @@ func replaceWithEnv(in []byte) []byte {
 	slice := strings.Split(name, ":")
 	// if slice has 2 elements, i.e given variable has default value
 	if len(slice) == 2 {
-		name = slice[0]
+		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

diff --git a/pkg/cmd/util_test.go b/pkg/cmd/util_test.go
@@ -149,11 +149,13 @@ func TestSubstituteVariables(t *testing.T) {
 	}
 
 	tests := []struct {
+		name             string
 		input            []byte
 		out              []byte
 		shouldRaiseError bool
 	}{
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -167,6 +169,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 			name: [[ TEST_SERVICE_NAME]]
 			containers:
@@ -180,6 +183,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd-[[ NONEXISTING ]]
 				containers:
@@ -189,6 +193,7 @@ func TestSubstituteVariables(t *testing.T) {
 			true,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -202,6 +207,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -215,6 +221,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -228,6 +235,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -241,6 +249,7 @@ func TestSubstituteVariables(t *testing.T) {
 			false,
 		},
 		{
+			"",
 			[]byte(`
 				name: httpd
 				containers:
@@ -253,22 +262,37 @@ func TestSubstituteVariables(t *testing.T) {
 				`),
 			false,
 		},
+		{
+			"Env variable has spaces around it and also has default value",
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:[[ TEST_IMAGE_TAG : latest ]]
+				`),
+			[]byte(`
+				name: httpd
+				containers:
+				- image: foo/bar:version
+				`),
+			false,
+		},
 	}
 
 	for _, test := range tests {
-		output, err := SubstituteVariables(test.input)
+		t.Run(test.name, func(t *testing.T) {
+			output, err := SubstituteVariables(test.input)
 
-		if test.shouldRaiseError && err == nil {
-			t.Errorf("input should cause error, but no error was returned \n input: %s\n", string(test.input[:]))
-		}
-
-		if !test.shouldRaiseError && err != nil {
-			t.Errorf("input caused error \n error: %s", err)
-		}
+			if test.shouldRaiseError && err == nil {
+				t.Errorf("input should cause error, but no error was returned \n input: %s\n", string(test.input[:]))
+			}
 
-		if !bytes.Equal(output, test.out) {
-			t.Errorf("output doesn't match expected output \n output  : %s \n expected: %s \n", string(output[:]), string(test.out[:]))
-		}
+			if !test.shouldRaiseError && err != nil {
+				t.Errorf("input caused error \n error: %s", err)
+			}
 
+			if !bytes.Equal(output, test.out) {
+				t.Errorf("output doesn't match expected output \n output  : %s \n expected: %s \n", string(output[:]), string(test.out[:]))
+			}
+		})
 	}
 }