ref(build.go): begin to translate mc commands to s3 client API calls

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -36,15 +36,6 @@ func repoCmd(repoDir, first string, others ...string) *exec.Cmd {
 	return cmd
 }
 
-// mcCmd returns a command to execute the 'mc' binary, so that it reads config from configDir.
-// the command outputs its stderr to os.Stderr
-func mcCmd(configDir string, args ...string) *exec.Cmd {
-	cmd := exec.Command("mc", "-C", configDir, "--quiet")
-	cmd.Args = append(cmd.Args, args...)
-	cmd.Stderr = os.Stderr
-	return cmd
-}
-
 func kGetCmd(podNS, podName string) *exec.Cmd {
 	return exec.Command("kubectl", fmt.Sprintf("--namespace=%s", podNS), "get", "pods", "-o", "yaml", podName)
 }
@@ -78,10 +69,12 @@ func build(conf *Config, s3Client *s3.Client, builderKey, gitSha string) error {
 	}
 	tmpDir := os.TempDir()
 
-	tarURL := fmt.Sprintf("%s://%s:%s/git/home/%s/tar", storage.schema(), storage.host(), storage.port(), slugName)
+	tarObjKey := fmt.Sprintf("home/%s/tar", slugName)
+	tarURL := fmt.Sprintf("%s://%s:%s/git/%s", storage.schema(), storage.host(), storage.port(), tarObjKey)
 
 	// this is where workflow tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
-	pushURL := fmt.Sprintf("%s://%s:%s/git/home/%s/push", storage.schema(), storage.host(), storage.port(), fmt.Sprintf("%s:git-%s", appName, gitSha))
+	pushObjKey := fmt.Sprintf("home/%s/push", fmt.Sprintf("%s:git-%s", appName, gitSha))
+	pushURL := fmt.Sprintf("%s://%s:%s/%s", storage.schema(), storage.host(), storage.port(), 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)
@@ -105,6 +98,7 @@ func build(conf *Config, s3Client *s3.Client, builderKey, gitSha string) error {
 	if err := run(gitArchiveCmd); err != nil {
 		return fmt.Errorf("running %s (%s)", strings.Join(gitArchiveCmd.Args, " "), err)
 	}
+	absAppTgz := fmt.Sprintf("%s/%s", repoDir, appTgz)
 
 	// untar the archive into the temp dir
 	tarCmd := repoCmd(repoDir, "tar", "-xzf", appTgz, "-C", fmt.Sprintf("%s/", tmpDir))
@@ -180,20 +174,17 @@ func build(conf *Config, s3Client *s3.Client, builderKey, gitSha string) error {
 		return fmt.Errorf("creating minio config file (%s)", err)
 	}
 
-	configCmd := mcCmd(configDir, "config", "host", "add", fmt.Sprintf("%s://%s:%s", storage.schema(), storage.host(), storage.port()), creds.key, creds.secret)
-	if err := run(configCmd); err != nil {
-		return fmt.Errorf("configuring the minio client (%s)", err)
+	bucketName := "git"
+	if _, err := s3Client.CreateBucket(&s3.CreateBucketInput{Bucket: aws.String(bucketName)}); bucketCreateErr != nil {
+		log.Warn("create bucket error: %+v", err)
 	}
 
-	makeBucketCmd := mcCmd(configDir, "mb", fmt.Sprintf("%s://%s:%s/git", storage.schema(), storage.host(), storage.port()))
-	// Don't look for errors here. Buckets may already exist
-	// https://github.com/deis/builder/issues/80 will eliminate this distaste
-	run(makeBucketCmd)
-
-	cpCmd := mcCmd(configDir, "cp", appTgz, tarURL)
-	cpCmd.Dir = repoDir
-	if err := run(cpCmd); err != nil {
-		return fmt.Errorf("copying %s to %s (%s)", appTgz, tarURL, err)
+	appTgzReader, err := os.Open(absAppTgz)
+	if err != nil {
+		return fmt.Errorf("opening %s for read (%s)", appTgz, err)
+	}
+	if err := storage.Upload(s3Client, bucketName, tarObjKey); err != nil {
+		return fmt.Errorf("uploading %s to %s/%s (%s)", absAppTgz, bucketName, tarObjKey, err)
 	}
 
 	log.Info("Starting build... but first, coffee!")
@@ -244,11 +235,9 @@ func build(conf *Config, s3Client *s3.Client, builderKey, gitSha string) error {
 	}
 
 	// poll the s3 server to ensure the slug exists
+	// TODO: time out looking
 	for {
-		// for now, assume the error indicates that the slug wasn't there, nothing else
-		// TODO: implement https://github.com/deis/builder/issues/80, which will clean this up siginficantly
-		lsCmd := mcCmd(configDir, "ls", pushURL)
-		if err := run(lsCmd); err == nil {
+		if storage.ObjectExists(s3Client, bucketName, pushObjKey) {
 			break
 		}
 	}