Merge pull request #103 from mboersma/fix-healthz-slashes

fix(http.go): don't double the slash in /healthz URL

Author: mboersma

http.go

@@ -139,7 +139,12 @@ your deis version is correct.`
 // Healthcheck can be called to see if the controller is healthy
 func (c *Client) Healthcheck() error {
 	// Make a request to /healthz and expect an ok HTTP response
-	req, err := http.NewRequest("GET", c.ControllerURL.String()+"/healthz", bytes.NewBuffer(nil))
+	controllerURL := c.ControllerURL.String()
+	// Don't double the last slash in the URL path
+	if !strings.HasSuffix(controllerURL, "/") {
+		controllerURL = controllerURL + "/"
+	}
+	req, err := http.NewRequest("GET", controllerURL+"healthz", bytes.NewBuffer(nil))
 	addUserAgent(&req.Header, c.UserAgent)
 
 	if err != nil {

http_test.go

@@ -236,7 +236,19 @@ func TestHealthcheck(t *testing.T) {
 	server := httptest.NewServer(handler)
 	defer server.Close()
 
-	deis, err := New(false, server.URL, "")
+	// Test with a trailing slash
+	deis, err := New(false, server.URL+"/", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	deis.UserAgent = "test"
+
+	if err = deis.Healthcheck(); err != nil {
+		t.Error(err)
+	}
+
+	// Test without a trailing slash
+	deis, err = New(false, server.URL, "")
 	if err != nil {
 		t.Fatal(err)
 	}