fix(pkg/gitreceive): look for the absolute location of the slug

this commit adds a convenience func in SlugBuilderInfo, tests for it,
and changes the build func to use it.

This commit also adds an AbsoluteSlugURL func to SlugBuilder, which
will be used in a subsequent commit.

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -223,13 +223,13 @@ func build(conf *Config, s3Client *storage.Client, kubeClient *client.Client, fs
 		conf.ObjectStorageTickDuration(),
 		conf.ObjectStorageWaitDuration(),
 		conf.Bucket,
-		slugBuilderInfo.PushKey(),
+		slugBuilderInfo.AbsoluteSlugObjectKey(),
 	)
 	// poll the s3 server to ensure the slug exists
 	if err := storage.WaitForObject(
 		s3Client,
 		conf.Bucket,
-		slugBuilderInfo.PushKey(),
+		slugBuilderInfo.AbsoluteSlugObjectKey(),
 		conf.ObjectStorageTickDuration(),
 		conf.ObjectStorageWaitDuration(),
 	); err != nil {

pkg/gitreceive/storage/slug_builder_info.go

@@ -6,6 +6,10 @@ import (
 	"github.com/deis/builder/pkg/gitreceive/git"
 )
 
+const (
+	slugTGZName = "slug.tgz"
+)
+
 // SlugBuilderInfo contains all of the object storage related information needed to pass to a slug builder
 type SlugBuilderInfo struct {
 	pushKey string
@@ -28,7 +32,11 @@ func NewSlugBuilderInfo(s3Endpoint *Endpoint, bucket, appName, slugName string,
 	}
 }
 
-func (s SlugBuilderInfo) PushKey() string { return s.pushKey }
-func (s SlugBuilderInfo) PushURL() string { return s.pushURL }
-func (s SlugBuilderInfo) TarKey() string  { return s.tarKey }
-func (s SlugBuilderInfo) TarURL() string  { return s.tarURL }
+func (s SlugBuilderInfo) PushKey() string               { return s.pushKey }
+func (s SlugBuilderInfo) PushURL() string               { return s.pushURL }
+func (s SlugBuilderInfo) TarKey() string                { return s.tarKey }
+func (s SlugBuilderInfo) TarURL() string                { return s.tarURL }
+func (s SlugBuilderInfo) AbsoluteSlugObjectKey() string { return s.PushKey() + "/" + slugTGZName }
+func (s SlugBuilderInfo) AbsoluteSlugURL() string {
+	return s.PushURL() + "/" + s.AbsoluteSlugObjectKey()
+}

pkg/gitreceive/storage/slug_builder_info_test.go

@@ -3,6 +3,7 @@ package storage
 import (
 	"testing"
 
+	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg/gitreceive/git"
 )
 
@@ -57,3 +58,17 @@ func TestTarKey(t *testing.T) {
 		t.Errorf("tar key %s didn't match expected %s", sbi.TarKey(), expectedTarKey)
 	}
 }
+
+func TestAbsoluteSlugObjectKey(t *testing.T) {
+	sha, err := git.NewSha(rawSha)
+	assert.NoErr(t, err)
+	sbi := NewSlugBuilderInfo(s3Endpoint, bucket, appName, slugName, sha)
+	assert.Equal(t, sbi.AbsoluteSlugObjectKey(), sbi.PushKey()+"/"+slugTGZName, "absolute slug key")
+}
+
+func TestAbsoluteSlugURL(t *testing.T) {
+	sha, err := git.NewSha(rawSha)
+	assert.NoErr(t, err)
+	sbi := NewSlugBuilderInfo(s3Endpoint, bucket, appName, slugName, sha)
+	assert.Equal(t, sbi.AbsoluteSlugURL(), sbi.PushURL()+"/"+sbi.PushKey()+"/"+slugTGZName, "absolute slug URL")
+}