feat(builder): add DRYCC_BUILDER specify builder

Author: duanhongyi

pkg/gitreceive/build.go

@@ -142,14 +142,8 @@ func build(
 		return fmt.Errorf("running %s (%s)", strings.Join(tarCmd.Args, " "), err)
 	}
 
-	var bType buildType
-	if buildPackURL != "" {
-		bType = buildTypeProcfile
-	} else {
-		bType = getBuildTypeForDir(tmpDir)
-	}
-
-	usingDockerfile := bType == buildTypeDockerfile
+	bType := getBuildType(tmpDir, appConf)
+	usingDockerfile := bType == buildTypeDockerbuilder
 
 	appTgzdata, err := ioutil.ReadFile(absAppTgz)
 	if err != nil {
@@ -370,7 +364,7 @@ func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, bType
 		}
 		return procType, nil
 	}
-	if bType != buildTypeProcfile {
+	if bType != buildTypeSlugbuilder {
 		return procType, nil
 	}
 	log.Debug("Procfile not present. Getting it from the buildpack")

pkg/gitreceive/build_test.go

@@ -122,7 +122,7 @@ func TestGetProcFileFromRepoSuccess(t *testing.T) {
 		}
 	}()
 	getter := &storage.FakeObjectGetter{}
-	procType, err := getProcFile(getter, tmpDir, objKey, buildTypeProcfile)
+	procType, err := getProcFile(getter, tmpDir, objKey, buildTypeSlugbuilder)
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
@@ -144,7 +144,7 @@ func TestGetProcFileFromRepoFailure(t *testing.T) {
 		}
 	}()
 	getter := &storage.FakeObjectGetter{}
-	_, err = getProcFile(getter, tmpDir, objKey, buildTypeProcfile)
+	_, err = getProcFile(getter, tmpDir, objKey, buildTypeSlugbuilder)
 
 	assert.True(t, err != nil, "no error received when there should have been")
 }
@@ -157,7 +157,7 @@ func TestGetProcFileFromServerSuccess(t *testing.T) {
 		},
 	}
 
-	procType, err := getProcFile(getter, "", objKey, buildTypeProcfile)
+	procType, err := getProcFile(getter, "", objKey, buildTypeSlugbuilder)
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
@@ -172,7 +172,7 @@ func TestGetProcFileFromServerFailure(t *testing.T) {
 		},
 	}
 
-	_, err := getProcFile(getter, "", objKey, buildTypeProcfile)
+	_, err := getProcFile(getter, "", objKey, buildTypeSlugbuilder)
 	assert.Err(t, err, fmt.Errorf("error in reading %s (%s)", objKey, expectedErr))
 	assert.True(t, err != nil, "no error received when there should have been")
 }

pkg/gitreceive/build_type.go

@@ -2,6 +2,7 @@ package gitreceive
 
 import (
 	"fmt"
+	"github.com/drycc/controller-sdk-go/api"
 	"os"
 )
 
@@ -12,14 +13,32 @@ func (b buildType) String() string {
 }
 
 const (
-	buildTypeProcfile   buildType = "procfile"
-	buildTypeDockerfile buildType = "dockerfile"
+	buildTypeSlugbuilder   buildType = "slugbuilder"
+	buildTypeDockerbuilder buildType = "dockerbuilder"
 )
 
-func getBuildTypeForDir(dirName string) buildType {
-	_, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName))
-	if err == nil {
-		return buildTypeDockerfile
+func getBuildType(dirName string, config api.Config) buildType {
+
+	hasDockerfile := false
+	if _, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName)); err == nil {
+		hasDockerfile = true
+	}
+
+	hasProcfile := false
+	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
+		hasProcfile = true
+	}
+	if hasDockerfile && hasProcfile {
+		if bTypeInterface, ok := config.Values["DRYCC_BUILDER"]; ok {
+			if strType, ok := bTypeInterface.(string); ok {
+				bType := buildType(strType)
+				if bType == buildTypeSlugbuilder || bType == buildTypeDockerbuilder {
+					return bType
+				}
+			}
+		}
+	} else if hasProcfile {
+		return buildTypeSlugbuilder
 	}
-	return buildTypeProcfile
+	return buildTypeDockerbuilder
 }

pkg/gitreceive/build_type_test.go

@@ -1,27 +1,52 @@
 package gitreceive
 
 import (
+	"github.com/drycc/controller-sdk-go/api"
 	"os"
 	"testing"
 )
 
-func TestGetBuildTypeForDir(t *testing.T) {
+func TestGetBuildType(t *testing.T) {
 	tmpDir := os.TempDir()
-	bType := getBuildTypeForDir(tmpDir)
-	if bType != buildTypeProcfile {
+	config := api.Config{}
+	bType := getBuildType(tmpDir, config)
+	if bType != buildTypeDockerbuilder {
 		t.Fatalf("expected procfile build, got %s", bType)
 	}
 	if _, err := os.Create(tmpDir + "/Dockerfile"); err != nil {
 		t.Fatalf("error creating %s/Dockerfile (%s)", tmpDir, err)
 	}
+
+	bType = getBuildType(tmpDir, config)
+	if bType != buildTypeDockerbuilder {
+		t.Fatalf("expected dockerfile build, got %s", bType)
+	}
+
+	if _, err := os.Create(tmpDir + "/Procfile"); err != nil {
+		t.Fatalf("error creating %s/Procfile (%s)", tmpDir, err)
+	}
+
 	defer func() {
 		if err := os.Remove(tmpDir + "/Dockerfile"); err != nil {
 			t.Fatalf("failed to remove Dockerfile from %s (%s)", tmpDir, err)
 		}
+		if err := os.Remove(tmpDir + "/Procfile"); err != nil {
+			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
+		}
 	}()
+	config.Values = map[string]interface{}{
+		"DRYCC_BUILDER": "slugbuilder",
+	}
+	bType = getBuildType(tmpDir, config)
+	if bType != buildTypeSlugbuilder {
+		t.Fatalf("expected procfile build, got %s", bType)
+	}
 
-	bType = getBuildTypeForDir(tmpDir)
-	if bType != buildTypeDockerfile {
-		t.Fatalf("expected dockerfile build, got %s", bType)
+	config.Values = map[string]interface{}{
+		"DRYCC_BUILDER": "dockerbuilder",
+	}
+	bType = getBuildType(tmpDir, config)
+	if bType != buildTypeDockerbuilder {
+		t.Fatalf("expected Dockerfile build, got %s", bType)
 	}
 }