fix(builder): properly escape backticks in envvars

for real this time!

Author: Matthew Fisher

builder/bin/get-app-values.go

@@ -26,7 +26,9 @@ func main() {
 		os.Exit(1)
 	}
 
+	var retVal string
 	for _, value := range values {
-		fmt.Println(value)
+		retVal = fmt.Sprintf("%s%s", retVal, value)
 	}
+	fmt.Println(retVal)
 }

builder/image/templates/builder

@@ -27,14 +27,6 @@ usage() {
     echo "Usage: $0 <user> <repo> <sha>"
 }
 
-parse-string(){
-    # helper to avoid the single quote escape
-    # occurred in command substitution
-    local args=() idx=0 IFS=' ' c
-    for c; do printf -v args[idx++] '%s ' "$c"; done
-    printf "%s\n" "${args[*]}"
-}
-
 if [ $# -ne $ARGS ]; then
     usage
     exit 1
@@ -113,7 +105,7 @@ if [ ! -f Dockerfile ]; then
     BUILD_OPTS+=' deis/slugbuilder'
 
     # build the application and attach to the process
-    JOB=$(eval '$(parse-string "${BUILD_OPTS[@]}")' )
+    JOB=$(${BUILD_OPTS[@]})
     docker attach $JOB
 
     # copy out the compiled slug

builder/utils.go

@@ -105,7 +105,7 @@ func ParseControllerConfig(bytes []byte) ([]string, error) {
 
 	retVal := []string{}
 	for k, v := range controllerConfig.Values {
-		retVal = append(retVal, fmt.Sprintf(" -e %s=\"%v\"", k, v))
+		retVal = append(retVal, fmt.Sprintf(" -e %s='%v'", k, v))
 	}
 	return retVal, nil
 }

builder/utils_test.go

@@ -163,8 +163,8 @@ func TestParseControllerConfigGood(t *testing.T) {
 		t.Errorf("expected 2, got %d", len(config))
 	}
 
-	if !stringInSlice(config, " -e CAR=\"star\"") {
-		t.Error("expected ' -e CAR=\"star\"' in slice")
+	if !stringInSlice(config, " -e CAR='star'") {
+		t.Error("expected ' -e CAR='star'' in slice")
 	}
 }