fix(client): show non-JSON HTTP errors

mboersma · mboersma · commit a8ab7419473a · 2015-09-01T15:29:40.000-06:00
diff --git a/client/controller/client/http.go b/client/controller/client/http.go
@@ -111,7 +111,7 @@ func checkForErrors(res *http.Response, body string) error {
 	bodyMap := make(map[string]interface{})
 
 	if err := json.Unmarshal([]byte(body), &bodyMap); err != nil {
-		return err
+		return fmt.Errorf("\n%s\n%s\n", res.Status, body)
 	}
 
 	errorMessage := fmt.Sprintf("\n%s\n", res.Status)
diff --git a/client/controller/client/http_test.go b/client/controller/client/http_test.go
@@ -178,6 +178,36 @@ error: This is an error.
 	if actual != expected && actual != altExpected {
 		t.Errorf("Expected %s or %s, Got %s", expected, altExpected, actual)
 	}
+
+	expected = `
+503 Service Temporarily Unavailable
+<html>
+<head><title>503 Service Temporarily Unavailable</title></head>
+<body bgcolor="white">
+<center><h1>503 Service Temporarily Unavailable</h1></center>
+<hr><center>nginx/1.9.4</center>
+</body>
+</html>
+`
+
+	body = `<html>
+<head><title>503 Service Temporarily Unavailable</title></head>
+<body bgcolor="white">
+<center><h1>503 Service Temporarily Unavailable</h1></center>
+<hr><center>nginx/1.9.4</center>
+</body>
+</html>`
+
+	res = http.Response{
+		StatusCode: http.StatusServiceUnavailable,
+		Status:     "503 Service Temporarily Unavailable",
+	}
+
+	actual = checkForErrors(&res, body).Error()
+
+	if actual != expected {
+		t.Errorf("Expected %s, Got %s", expected, actual)
+	}
 }
 
 func TestCheckErrorsReturnsNil(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func checkForErrors(res *http.Response, body string) error {`
`111`	`111`	`bodyMap := make(map[string]interface{})`
`112`	`112`
`113`	`113`	`if err := json.Unmarshal([]byte(body), &bodyMap); err != nil {`
`114`		`- return err`
	`114`	`+ return fmt.Errorf("\n%s\n%s\n", res.Status, body)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`errorMessage := fmt.Sprintf("\n%s\n", res.Status)`