ref(*): use S3 client instead of mc CLI

Author: aledbf

glide.lock

@@ -25,10 +25,15 @@ import:
 - package: gopkg.in/yaml.v2
   version: eca94c41d994ae2215d455ce578ae6e2dc6ee516
 - package: github.com/labstack/gommon
-- package: https://github.com/pborman/uuid
+- package: github.com/pborman/uuid
 - package: github.com/deis/pkg
   subpackages:
   - /time
 - package: github.com/codegangsta/cli
   version: a65b733b303f0055f8d324d805f393cd3e7a7904
-- package: github.com/mitchellh/goamz
+- package: github.com/aws/aws-sdk-go
+  version: 87b1e60a50b09e4812dee560b33a238f67305804
+  subpackages:
+  - aws
+  - aws/session
+  - service/s3

glide.yaml

@@ -10,10 +10,10 @@ 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/deis/builder/pkg/gitreceive/storage"
-	"github.com/mitchellh/goamz/s3"
 	"github.com/pborman/uuid"
 	"gopkg.in/yaml.v2"
 )
@@ -72,11 +72,11 @@ func build(conf *Config, s3Client *s3.S3, builderKey, gitSha string) error {
 	tmpDir := os.TempDir()
 
 	tarObjKey := fmt.Sprintf("home/%s/tar", slugName)
-	tarURL := fmt.Sprintf("%s/git/%s", s3Client.S3Endpoint, tarObjKey)
+	tarURL := fmt.Sprintf("%s/git/%s", s3Client.Endpoint, tarObjKey)
 
 	// this is where workflow tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
 	pushObjKey := fmt.Sprintf("home/%s/push", fmt.Sprintf("%s:git-%s", appName, gitSha))
-	pushURL := fmt.Sprintf("%s/%s", s3Client.S3Endpoint, pushObjKey)
+	pushURL := fmt.Sprintf("%s/%s", s3Client.Endpoint, pushObjKey)
 
 	// Get the application config from the controller, so we can check for a custom buildpack URL
 	appConf, err := getAppConfig(conf, builderKey, conf.Username, appName)
@@ -125,23 +125,22 @@ func build(conf *Config, s3Client *s3.S3, builderKey, gitSha string) error {
 	}
 
 	var srcManifest string
-	if creds == nil {
-		// both key and secret are missing, proceed with no credentials
-		if usingDockerfile {
-			srcManifest = "/etc/deis-dockerbuilder-no-creds.yaml"
-		} else {
-			srcManifest = "/etc/deis-slugbuilder-no-creds.yaml"
-		}
-	} else if err == nil {
+
+	creds := storage.CredsOK()
+	if creds {
 		// both key and secret are in place, so proceed with credentials
 		if usingDockerfile {
 			srcManifest = "/etc/deis-dockerbuilder.yaml"
 		} else {
 			srcManifest = "/etc/deis-slugbuilder.yaml"
 		}
-	} else if err != nil {
-		// unexpected error, fail
-		return fmt.Errorf("unexpected error (%s)", err)
+	} else {
+		// both key and secret are missing, proceed with no credentials
+		if usingDockerfile {
+			srcManifest = "/etc/deis-dockerbuilder-no-creds.yaml"
+		} else {
+			srcManifest = "/etc/deis-slugbuilder-no-creds.yaml"
+		}
 	}
 
 	fileBytes, err := ioutil.ReadFile(srcManifest)
@@ -181,7 +180,7 @@ func build(conf *Config, s3Client *s3.S3, builderKey, gitSha string) error {
 		return fmt.Errorf("opening %s for read (%s)", appTgz, err)
 	}
 	if err := storage.UploadObject(s3Client, bucketName, tarObjKey, appTgzReader); err != nil {
-		return fmt.Errorf("uploading %s to %s/%s (%s)", absAppTgz, bucketName, tarObjKey, err)
+		return fmt.Errorf("uploading %s to %s/%s (%v)", absAppTgz, bucketName, tarObjKey, err)
 	}
 
 	log.Info("Starting build... but first, coffee!")

pkg/gitreceive/build.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mitchellh/goamz/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 const (
@@ -17,14 +17,14 @@ const (
 var (
 	errMissingKey    = fmt.Errorf("missing %s", accessKeyIDFile)
 	errMissingSecret = fmt.Errorf("missing %s", accessSecretKeyFile)
-	emptyAuth        = &aws.Auth{}
+	emptyAuth        = credentials.AnonymousCredentials
 )
 
-// getCreds gets storage credentials from accessKeyIDFile and accessSecretKeyFile.
+// getAuth gets storage credentials from accessKeyIDFile and accessSecretKeyFile.
 // if a key exists but not a secret, or vice-versa, returns an error.
 // if both don't exist returns emptyAuth.
 // otherwise returns a valid auth
-func getAuth() (*aws.Auth, error) {
+func getAuth() (*credentials.Credentials, error) {
 	accessKeyIDBytes, accessKeyErr := ioutil.ReadFile(accessKeyIDFile)
 	accessSecretKeyBytes, accessSecretKeyErr := ioutil.ReadFile(accessSecretKeyFile)
 	if accessKeyErr == os.ErrNotExist && accessSecretKeyErr == os.ErrNotExist {
@@ -37,8 +37,22 @@ func getAuth() (*aws.Auth, error) {
 		return nil, errMissingSecret
 	}
 
-	return &aws.Auth{
-		AccessKey: strings.TrimSpace(string(accessKeyIDBytes)),
-		SecretKey: strings.TrimSpace(string(accessSecretKeyBytes)),
-	}, nil
+	id := strings.TrimSpace(string(accessKeyIDBytes))
+	secret := strings.TrimSpace(string(accessSecretKeyBytes))
+	return credentials.NewStaticCredentials(id, secret, ""), nil
+}
+
+// CredsOK checks if the required credentials to make a request exist
+func CredsOK() bool {
+	cred, err := getAuth()
+	if err != nil {
+		return false
+	}
+
+	auth, _ := cred.Get()
+	if auth.AccessKeyID == "" && auth.SecretAccessKey == "" {
+		return false
+	}
+
+	return true
 }