fix(slug_builder_info.go,slug_builder_info_test.go): fix push URL endpoint

and enhance tests to look for it

Author: Aaron Schlesinger

pkg/gitreceive/storage/slug_builder_info.go

@@ -18,11 +18,11 @@ type SlugBuilderInfo struct {
 func NewSlugBuilderInfo(s3Endpoint, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
 	tarKey := fmt.Sprintf("home/%s/tar", slugName)
 	// this is where workflow tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
-	pushKey := fmt.Sprintf("home/%s:git-%s/push", appName, gitSha.Short)
+	pushKey := fmt.Sprintf("home/%s:git-%s/push", appName, gitSha.Full)
 
 	return &SlugBuilderInfo{
 		PushKey: pushKey,
-		PushURL: fmt.Sprintf("%s/%s", s3Endpoint, pushKey),
+		PushURL: fmt.Sprintf("%s/git/%s", s3Endpoint, pushKey),
 		TarKey:  tarKey,
 		TarURL:  fmt.Sprintf("%s/git/%s", s3Endpoint, tarKey),
 	}

pkg/gitreceive/storage/slug_builder_info_test.go

@@ -1,7 +1,6 @@
 package storage
 
 import (
-	"strings"
 	"testing"
 
 	"github.com/deis/builder/pkg/gitreceive/git"
@@ -20,10 +19,13 @@ func TestS3Endpoint(t *testing.T) {
 		t.Fatalf("error building git sha (%s)", err)
 	}
 	sbi := NewSlugBuilderInfo(s3Endpoint, appName, slugName, sha)
-	if !strings.HasPrefix(sbi.PushURL, s3Endpoint) {
-		t.Errorf("push URL %s didn't have expected s3 endpoint prefix %s", sbi.PushURL, s3Endpoint)
+
+	expectedPushURL := s3Endpoint + "/git/" + sbi.PushKey
+	if sbi.PushURL != expectedPushURL {
+		t.Errorf("push URL %s didn't match expected %s", sbi.PushURL, expectedPushURL)
 	}
-	if !strings.HasPrefix(sbi.TarURL, s3Endpoint) {
-		t.Errorf("tar URL %s didn't have expected s3 endpoint prefix %s", sbi.TarURL, s3Endpoint)
+	expectedTarURL := s3Endpoint + "/git/" + sbi.TarKey
+	if sbi.TarURL != expectedTarURL {
+		t.Errorf("tar URL %s didn't match expected %s", sbi.TarURL, expectedTarURL)
 	}
 }