fix(pkg/gitreceive): move the build hook construction to a separate func

and add tests for the func. this commit also uses SlugBuilderInfo’s
AbsoluteSlugURL func to pass the slug’s full URL to the controller

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -239,20 +239,7 @@ func build(conf *Config, s3Client *storage.Client, kubeClient *client.Client, fs
 	log.Info("Launching app.")
 	log.Info("Launching...")
 
-	buildHook := &pkg.BuildHook{
-		Sha:         gitSha.Short(),
-		ReceiveUser: conf.Username,
-		ReceiveRepo: appName,
-		Image:       appName,
-		Procfile:    procType,
-	}
-	if !usingDockerfile {
-		buildHook.Dockerfile = ""
-		// need this to tell the controller what URL to give the slug runner
-		buildHook.Image = slugBuilderInfo.PushURL() + "/slug.tgz"
-	} else {
-		buildHook.Dockerfile = "true"
-	}
+	buildHook := createBuildHook(slugBuilderInfo, gitSha, conf.Username, appName, procType, usingDockerfile)
 	buildHookResp, err := publishRelease(conf, builderKey, buildHook)
 	if err != nil {
 		return fmt.Errorf("publishing release (%s)", err)

pkg/gitreceive/controller.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 
 	"github.com/deis/builder/pkg"
+	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/gitreceive/storage"
 	"github.com/deis/pkg/log"
 )
 
@@ -148,3 +150,28 @@ func receive(conf *Config, builderKey, gitSha string) error {
 	}
 	return nil
 }
+
+func createBuildHook(
+	slugBuilderInfo *storage.SlugBuilderInfo,
+	gitSha *git.SHA,
+	username,
+	appName string,
+	procType pkg.ProcessType,
+	usingDockerfile bool,
+) *pkg.BuildHook {
+	ret := &pkg.BuildHook{
+		Sha:         gitSha.Short(),
+		ReceiveUser: username,
+		ReceiveRepo: appName,
+		Image:       appName,
+		Procfile:    procType,
+	}
+	if !usingDockerfile {
+		ret.Dockerfile = ""
+		// need this to tell the controller what URL to give the slug runner
+		ret.Image = slugBuilderInfo.AbsoluteSlugURL()
+	} else {
+		ret.Dockerfile = "true"
+	}
+	return ret
+}

pkg/gitreceive/controller_test.go

@@ -0,0 +1,42 @@
+package gitreceive
+
+import (
+	"testing"
+
+	"github.com/arschles/assert"
+	"github.com/deis/builder/pkg"
+	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/gitreceive/storage"
+)
+
+const (
+	rawSha   = "c3b4e4ba8b7267226ff02ad07a3a2cca9c9237de"
+	bucket   = "git"
+	appName  = "myapp"
+	slugName = "myslug"
+	username = "myuser"
+)
+
+func TestCreateBuildHook(t *testing.T) {
+	procType := pkg.ProcessType(make(map[string]string))
+	sha, err := git.NewSha(rawSha)
+	assert.NoErr(t, err)
+	endpoint := &storage.Endpoint{URLStr: "s3.amazonaws.com", Secure: false}
+	slugBuilderInfo := storage.NewSlugBuilderInfo(endpoint, bucket, appName, slugName, sha)
+	hookUsingDockerfile := createBuildHook(slugBuilderInfo, sha, username, appName, procType, true)
+	assert.Equal(t, hookUsingDockerfile.Sha, sha.Short(), "git sha")
+	assert.Equal(t, hookUsingDockerfile.ReceiveUser, username, "username")
+	assert.Equal(t, hookUsingDockerfile.ReceiveRepo, appName, "username")
+	assert.Equal(t, hookUsingDockerfile.Image, appName, "image")
+	assert.Equal(t, hookUsingDockerfile.Procfile, procType, "procfile")
+	assert.Equal(t, hookUsingDockerfile.Dockerfile, "true", "dockerfile field")
+
+	hookNoDockerfile := createBuildHook(slugBuilderInfo, sha, username, appName, procType, false)
+	assert.Equal(t, hookNoDockerfile.Sha, sha.Short(), "git sha")
+	assert.Equal(t, hookNoDockerfile.ReceiveUser, username, "username")
+	assert.Equal(t, hookNoDockerfile.ReceiveRepo, appName, "username")
+	assert.Equal(t, hookNoDockerfile.Image, slugBuilderInfo.AbsoluteSlugURL(), "image")
+	assert.Equal(t, hookNoDockerfile.Procfile, procType, "procfile")
+	assert.Equal(t, hookNoDockerfile.Dockerfile, "", "dockerfile field")
+
+}