fix(builder): parse release info correctly

Release info was being parsed improperly. We should only fall back to
the Procfile if we cannot find any default process types from the
release info.

Author: Matthew Fisher

builder/image/templates/builder

@@ -149,9 +149,12 @@ else
     RELEASE_INFO="{}"
 fi
 
-if [ -f $TMP_DIR/Procfile ]; then
-    # update release info with data from the Procfile
-    RELEASE_INFO=$(cat $TMP_DIR/Procfile | /app/bin/yaml2json-procfile)
+if [ "$RELEASE_INFO" == "{}" ]; then
+    if [ -f $TMP_DIR/Procfile ]; then
+        # fall back to Procfile if there's no default process types
+        # FIXME: refactor into slugbuilder
+        RELEASE_INFO=$(cat $TMP_DIR/Procfile | /app/bin/yaml2json-procfile)
+    fi
 fi
 
 puts-step "Launching... "

builder/utils.go

@@ -71,7 +71,7 @@ func ParseReleaseVersion(bytes []byte) (int, error) {
 
 func GetDefaultType(bytes []byte) (string, error) {
 	type YamlTypeMap struct {
-		DefaultProcessTypes ProcessType
+		DefaultProcessTypes ProcessType `default_process_types`
 	}
 
 	var p YamlTypeMap
@@ -80,7 +80,7 @@ func GetDefaultType(bytes []byte) (string, error) {
 		return "", err
 	}
 
-	retVal, err := json.Marshal(&p)
+	retVal, err := json.Marshal(&p.DefaultProcessTypes)
 
 	if err != nil {
 		return "", err

builder/utils_test.go

@@ -121,8 +121,11 @@ default_process_types:
 		if err != nil {
 			t.Error(err)
 		}
-		if defaultType == "" {
-			t.Error("default type cannot be empty")
+		if defaultType != `{"web":"while true; do echo hello; sleep 1; done"}` && string(data) != "" {
+			t.Errorf("incorrect default type, got %s", defaultType)
+		}
+		if string(data) == "" && defaultType != "{}" {
+			t.Errorf("incorrect default type, got %s", defaultType)
 		}
 	}
 }