fix(pkg/gitreceive): pass the endpoint around, not the string URL

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -63,7 +63,7 @@ func build(conf *Config, s3Client *storage.Client, kubeClient *client.Client, fs
 		return fmt.Errorf("unable to create tmpdir %s (%s)", buildDir, err)
 	}
 
-	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint.URLStr, conf.Bucket, appName, slugName, gitSha)
+	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint, conf.Bucket, appName, slugName, gitSha)
 
 	// Get the application config from the controller, so we can check for a custom buildpack URL
 	appConf, err := getAppConfig(conf, builderKey, conf.Username, appName)

pkg/gitreceive/storage/slug_builder_info.go

@@ -15,16 +15,16 @@ type SlugBuilderInfo struct {
 }
 
 // NewSlugBuilderInfo creates and populates a new SlugBuilderInfo based on the given data
-func NewSlugBuilderInfo(s3Endpoint, bucket, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
+func NewSlugBuilderInfo(s3Endpoint *Endpoint, bucket, 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())
 
 	return &SlugBuilderInfo{
 		pushKey: pushKey,
-		pushURL: fmt.Sprintf("%s/%s/%s", s3Endpoint, bucket, pushKey),
+		pushURL: fmt.Sprintf("%s/%s/%s", s3Endpoint.FullURL(), bucket, pushKey),
 		tarKey:  tarKey,
-		tarURL:  fmt.Sprintf("%s/%s/%s", s3Endpoint, bucket, tarKey),
+		tarURL:  fmt.Sprintf("%s/%s/%s", s3Endpoint.FullURL(), bucket, tarKey),
 	}
 }
 

pkg/gitreceive/storage/slug_builder_info_test.go

@@ -7,11 +7,14 @@ import (
 )
 
 const (
-	rawSha     = "c3b4e4ba8b7267226ff02ad07a3a2cca9c9237de"
-	s3Endpoint = "http://10.1.2.3:9090"
-	appName    = "myapp"
-	slugName   = "myslug"
-	bucket     = "git"
+	rawSha   = "c3b4e4ba8b7267226ff02ad07a3a2cca9c9237de"
+	appName  = "myapp"
+	slugName = "myslug"
+	bucket   = "git"
+)
+
+var (
+	s3Endpoint = &Endpoint{URLStr: "10.1.2.3:9090", Secure: false}
 )
 
 func TestS3Endpoint(t *testing.T) {
@@ -21,11 +24,11 @@ func TestS3Endpoint(t *testing.T) {
 	}
 	sbi := NewSlugBuilderInfo(s3Endpoint, bucket, appName, slugName, sha)
 
-	expectedPushURL := s3Endpoint + "/" + bucket + "/" + sbi.PushKey()
+	expectedPushURL := s3Endpoint.FullURL() + "/" + bucket + "/" + sbi.PushKey()
 	if sbi.PushURL() != expectedPushURL {
 		t.Errorf("push URL %s didn't match expected %s", sbi.PushURL(), expectedPushURL)
 	}
-	expectedTarURL := s3Endpoint + "/" + bucket + "/" + sbi.TarKey()
+	expectedTarURL := s3Endpoint.FullURL() + "/" + bucket + "/" + sbi.TarKey()
 	if sbi.TarURL() != expectedTarURL {
 		t.Errorf("tar URL %s didn't match expected %s", sbi.TarURL(), expectedTarURL)
 	}