Merge pull request #127 from arschles/build-choice

fix(Makefile,build.go,build_type.go,build_type_test.go): choose slug builds by default, unless a Dockerfile is present

Author: arschles

Makefile

@@ -27,6 +27,7 @@ RC := manifests/deis-${SHORT_NAME}-rc.yaml
 SVC := manifests/deis-${SHORT_NAME}-service.yaml
 IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
 
+TEST_PACKAGES := $(shell ${DEV_ENV_CMD} glide nv)
 
 all:
 	@echo "Use a Makefile to control top-level building of the project."
@@ -45,12 +46,7 @@ build:
 	@$(call check-static-binary,$(BINARY_DEST_DIR)/boot)
 
 test:
-	${DEV_ENV_CMD} go test ./pkg && \
-	${DEV_ENV_CMD} go test ./pkg/confd && \
-	${DEV_ENV_CMD} go test ./pkg/env && \
-	${DEV_ENV_CMD} go test ./pkg/etcd && \
-	${DEV_ENV_CMD} go test ./pkg/git && \
-	${DEV_ENV_CMD} go test ./pkg/sshd
+	${DEV_ENV_CMD} go test ${TEST_PACKAGES}
 
 docker-build:
 	docker build --rm -t ${IMAGE} rootfs

glide.yaml

@@ -21,10 +21,7 @@ import:
 - package: gopkg.in/yaml.v2
   version: eca94c41d994ae2215d455ce578ae6e2dc6ee516
 - package: github.com/labstack/gommon
-- package: code.google.com/p/go-uuid
-  version: 35bc42037350f0078e3c974c6ea690f1926603ab
-  subpackages:
-  - uuid
+- package: https://github.com/pborman/uuid
 - package: github.com/deis/pkg
   subpackages:
   - /time

pkg/gitreceive/build.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go-uuid/uuid"
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/gitreceive/log"
+	"github.com/pborman/uuid"
 	"gopkg.in/yaml.v2"
 )
 
@@ -123,18 +123,22 @@ func build(conf *Config, builderKey, gitSha string) error {
 		return fmt.Errorf("running %s (%s)", strings.Join(tarCmd.Args, " "), err)
 	}
 
-	usingDockerfile := true
-	rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", tmpDir))
-	if err == nil {
-		usingDockerfile = false
-	}
+	bType := getBuildTypeForDir(tmpDir)
+	usingDockerfile := bType == buildTypeDockerfile
+
 	var procType pkg.ProcessType
-	if err := yaml.Unmarshal(rawProcFile, &procType); err != nil {
-		return fmt.Errorf("procfile %s/ProcFile is malformed (%s)", tmpDir, err)
+	if bType == buildTypeProcfile {
+		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", tmpDir))
+		if err != nil {
+			return fmt.Errorf("reading %s/Procfile", tmpDir)
+		}
+		if err := yaml.Unmarshal(rawProcFile, &procType); err != nil {
+			return fmt.Errorf("procfile %s/ProcFile is malformed (%s)", tmpDir, err)
+		}
 	}
 
 	var srcManifest string
-	if err == os.ErrNotExist {
+	if creds == nil {
 		// both key and secret are missing, proceed with no credentials
 		if usingDockerfile {
 			srcManifest = "/etc/deis-dockerbuilder-no-creds.yaml"

pkg/gitreceive/build_type.go

@@ -0,0 +1,25 @@
+package gitreceive
+
+import (
+	"fmt"
+	"os"
+)
+
+type buildType string
+
+func (b buildType) String() string {
+	return string(b)
+}
+
+const (
+	buildTypeProcfile   buildType = "procfile"
+	buildTypeDockerfile buildType = "dockerfile"
+)
+
+func getBuildTypeForDir(dirName string) buildType {
+	_, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName))
+	if err == nil {
+		return buildTypeDockerfile
+	}
+	return buildTypeProcfile
+}

pkg/gitreceive/build_type_test.go

@@ -0,0 +1,27 @@
+package gitreceive
+
+import (
+	"os"
+	"testing"
+)
+
+func TestGetBuildTypeForDir(t *testing.T) {
+	tmpDir := os.TempDir()
+	bType := getBuildTypeForDir(tmpDir)
+	if bType != buildTypeProcfile {
+		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)
+	}
+	defer func() {
+		if err := os.Remove(tmpDir + "/Dockerfile"); err != nil {
+			t.Fatalf("failed to remove Dockerfile from %s (%s)", tmpDir, err)
+		}
+	}()
+
+	bType = getBuildTypeForDir(tmpDir)
+	if bType != buildTypeDockerfile {
+		t.Fatalf("expected dockerfile build, got %s", bType)
+	}
+}