fix(*): improve on build errors with AWS SDK

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/gitreceive/log"
 	"github.com/pborman/uuid"
@@ -51,7 +52,7 @@ func run(cmd *exec.Cmd) error {
 	return cmd.Run()
 }
 
-func build(conf *Config, s3Client *s3.Client, builderKey, gitSha string) error {
+func build(conf *Config, s3Client *s3.S3, builderKey, gitSha string) error {
 	repo := conf.Repository
 	if len(gitSha) <= shortShaIdx {
 		return errGitShaTooShort{sha: gitSha}

pkg/gitreceive/storage/bucket.go

@@ -1,6 +1,11 @@
 package storage
 
-func CreateBucket(s3Client *s3.Client, bucketName string) error {
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/s3"
+)
+
+func CreateBucket(s3Client *s3.S3, bucketName string) error {
 	_, err := s3Client.CreateBucket(&s3.CreateBucketInput{
 		Bucket: aws.String(bucketName),
 	})

pkg/gitreceive/storage/client.go

@@ -12,7 +12,7 @@ func GetClient() (*s3.S3, error) {
 	if err != nil {
 		return nil, err
 	}
-	awsCfg.Endpoint = endpt
+	awsCfg.Endpoint = aws.String(endpt)
 	creds, err := getCreds()
 	if err != nil {
 		return nil, err

pkg/gitreceive/storage/endpoint.go

@@ -32,6 +32,6 @@ func getEndpoint() (string, error) {
 	} else if oHost != "" && oPort != "" {
 		return fmt.Sprintf("https://%s:%s", oHost, oPort), nil
 	} else {
-		return nil, errNoStorageConfig
+		return "", errNoStorageConfig
 	}
 }

pkg/gitreceive/storage/exists.go

@@ -11,7 +11,7 @@ func ObjectExists(s3Client *s3.S3, bucket, objName string) bool {
 		Bucket: aws.String(bucket),
 		Key:    aws.String(objName),
 	}
-	resp, err := svc.HeadObject(in)
+	resp, err := s3Client.HeadObject(in)
 	if err != nil {
 		return false
 	}