fix(etcd.go): workaround missing env var

“url” wasn’t found in the given params, so I’ve worked around it here

Author: arschles

pkg/etcd/etcd.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 	"time"
 
@@ -22,6 +23,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.
@@ -64,7 +71,19 @@ 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)
+	host := os.Getenv(hostEnvVar)
+	port, err := strconv.Atoi(os.Getenv(portEnvVar))
+	if host == "" {
+		host = defaultHost
+	}
+	if err != nil {
+		port = 4001
+	}
+
+	// Aaron(12/9/2015): to shame me into fixing this later, but it's a bigger change
+	fmt.Println("Aaron hasn't fixed the env var collection stage in the cookoo route yet...")
+	// url := p.Get("url", "http://localhost:4001").(string)
+	url := fmt.Sprintf("%s:%d", host, port)
 
 	// Backed this out because it's unnecessary so far.
 	//hosts := p.Get("urls", []string{"http://localhost:4001"}).([]string)