Merge pull request #18 from arschles/minio

feat(*): add support for uploading tarballs to minio

Author: arschles

pkg/confd/confd.go

@@ -45,14 +45,14 @@ func RunOnce(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 	var lasterr error
 	start := time.Now()
 	for i := 0; i < limit; i++ {
-		if out, err := exec.Command("confd", dargs...).CombinedOutput(); err == nil {
+		out, err := exec.Command("confd", dargs...).CombinedOutput()
+		if err == nil {
 			log.Infof(c, "Templates generated for %s on run %d", node, i)
 			return out, nil
-		} else {
-			log.Debugf(c, "Recoverable error: %s", err)
-			log.Debugf(c, "Output: %q", out)
-			lasterr = err
 		}
+		log.Debugf(c, "Recoverable error: %s", err)
+		log.Debugf(c, "Output: %q", out)
+		lasterr = err
 
 		time.Sleep(timeout)
 		log.Infof(c, "Re-trying template build. (Elapsed time: %d)", time.Now().Sub(start)/time.Second)

pkg/etcd/etcd.go

@@ -1,5 +1,4 @@
-/*Package etcd is a library for performing common Etcd tasks.
- */
+// Package etcd is a library for performing common Etcd tasks.
 package etcd
 
 import (
@@ -23,6 +22,12 @@ var (
 	retrySleep  = 200 * time.Millisecond
 )
 
+const (
+	hostEnvVar  = "DEIS_ETCD_1_SERVICE_HOST"
+	portEnvVar  = "DEIS_ETCD_1_SERVICE_PORT_CLIENT"
+	defaultHost = "http://localhost"
+)
+
 // Getter describes the Get behavior of an Etcd client.
 //
 // Usually you will want to use go-etcd/etcd.Client to satisfy this.
@@ -65,7 +70,11 @@ type GetterSetter interface {
 // Returns:
 // 	This puts an *etcd.Client into the context.
 func CreateClient(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
-	url := p.Get("url", "http://localhost:4001").(string)
+	url, ok := p.Get("url", "http://localhost:4001").(string)
+	if !ok {
+		fmt.Println("ERROR: 'url' param was not a string")
+		os.Exit(1)
+	}
 
 	// Backed this out because it's unnecessary so far.
 	//hosts := p.Get("urls", []string{"http://localhost:4001"}).([]string)
@@ -136,7 +145,7 @@ func IsRunning(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrup
 		time.Sleep(250 * time.Millisecond)
 	}
 	log.Errf(c, "Etcd is not answering after %d attempts.", count)
-	return false, &cookoo.FatalError{"Could not connect to Etcd."}
+	return false, &cookoo.FatalError{Message: "Could not connect to Etcd."}
 }
 
 // Set sets a value in etcd.
@@ -399,7 +408,7 @@ func MakeDir(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 
 	res, err := client.CreateDir(name, ttl)
 	if err != nil {
-		return res, &cookoo.RecoverableError{err.Error()}
+		return res, &cookoo.RecoverableError{Message: err.Error()}
 	}
 
 	return res, nil

pkg/git/git.go

@@ -177,12 +177,12 @@ func createRepo(c cookoo.Context, repoPath, gitHome string) (bool, error) {
 	createLock.Lock()
 	defer createLock.Unlock()
 
-	if fi, err := os.Stat(repoPath); err == nil && fi.IsDir() {
+	fi, err := os.Stat(repoPath)
+	if err == nil && fi.IsDir() {
 		// Nothing to do.
 		log.Infof(c, "Directory %s already exists.", repoPath)
 		return false, nil
 	} else if os.IsNotExist(err) {
-
 		log.Infof(c, "Creating new directory at %s", repoPath)
 		// Create directory
 		if err := os.MkdirAll(repoPath, 0755); err != nil {
@@ -205,9 +205,8 @@ func createRepo(c cookoo.Context, repoPath, gitHome string) (bool, error) {
 		return true, nil
 	} else if err == nil {
 		return false, errors.New("Expected directory, found file.")
-	} else {
-		return false, err
 	}
+	return false, err
 }
 
 //prereceiveHook templates a pre-receive hook for Git.

pkg/sshd/server.go

@@ -1,11 +1,10 @@
-/*Package sshd implements an SSH server.
-
-See https://tools.ietf.org/html/rfc4254
-
-This was copied over (and effectively forked from) cookoo-ssh. Mainly this
-differs from the cookoo-ssh version in that this does not act like a
-stand-alone SSH server.
-*/
+// Package sshd implements an SSH server.
+//
+// See https://tools.ietf.org/html/rfc4254
+//
+// This was copied over (and effectively forked from) cookoo-ssh. Mainly this
+// differs from the cookoo-ssh version in that this does not act like a
+// stand-alone SSH server.
 package sshd
 
 import (
@@ -169,7 +168,7 @@ func sshConnection(conn net.Conn) string {
 	rhost, rport, _ := net.SplitHostPort(remote)
 	lhost, lport, _ := net.SplitHostPort(local)
 
-	return fmt.Sprintf("%s %d %s %d", rhost, rport, lhost, lport)
+	return fmt.Sprintf("%s %s %s %s", rhost, rport, lhost, lport)
 }
 
 func sendExitStatus(status uint32, channel ssh.Channel) error {

rootfs/etc/confd/templates/builder

@@ -95,7 +95,10 @@ else
   fi
 fi
 
+git archive --format=tar.gz ${GIT_SHA} > ${APP_NAME}.tar.gz
+
 # if minio is in the cluster, use it. otherwise use fetcher
+# TODO: figure out something for using S3 also
 if [[ -n "$DEIS_MINIO_SERVICE_HOST" && -n "$DEIS_MINIO_SERVICE_PORT" ]]; then
   S3EP=${DEIS_MINIO_SERVICE_HOST}:${DEIS_MINIO_SERVICE_PORT}
 elif [ -z "$S3EP" ]; then
@@ -109,6 +112,16 @@ sed -i -- "s#repo_name#$META_NAME#g" /etc/${SLUG_NAME}.yaml
 sed -i -- "s#puturl#$PUSH_URL#g" /etc/${SLUG_NAME}.yaml
 sed -i -- "s#tar-url#$TAR_URL#g" /etc/${SLUG_NAME}.yaml
 
+ACCESS_KEY=`cat /var/run/secrets/object/store/access-key-id`
+ACCESS_SECRET=`cat /var/run/secrets/object/store/access-secret-key`
+mkdir -p /var/minio-conf
+CONFIG_DIR=/var/minio-conf
+echo "mc -C $CONFIG_DIR config host add "http://$S3EP" $ACCESS_KEY $ACCESS_SECRET"
+mc -C $CONFIG_DIR --quiet config host add "http://$S3EP" $ACCESS_KEY $ACCESS_SECRET
+mc -C $CONFIG_DIR --quiet mb "${S3EP}/git"
+mc -C $CONFIG_DIR --quiet cp ${APP_NAME}.tar.gz $TAR_URL
+echo "stored tarfile in $TAR_URL"
+
 kubectl create -f /etc/${SLUG_NAME}.yaml
 
 #check for image creation or slug existence in S3EP