fix(etcd.go): back out cookoo.Params short-circuit

see https://github.com/deis/builder/pull/18/files#r47149280 for history

Author: arschles

pkg/etcd/etcd.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"strconv"
 	"strings"
 	"time"
 
@@ -71,20 +70,12 @@ type GetterSetter interface {
 // Returns:
 // 	This puts an *etcd.Client into the context.
 func CreateClient(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt) {
-	host := os.Getenv(hostEnvVar)
-	port, err := strconv.Atoi(os.Getenv(portEnvVar))
-	if host == "" {
-		host = defaultHost
-	}
-	if err != nil {
-		port = 4001
+	url, ok := p.Get("url", "http://localhost:4001").(string)
+	if !ok {
+		fmt.Println("ERROR: 'url' param was not a string")
+		os.Exit(1)
 	}
 
-	// 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)
 	hosts := []string{url}