fix(controller.go,get_app_config.go,publish_release.go): return controller URL that errored

Author: arschles

pkg/gitreceive/controller.go

@@ -12,12 +12,17 @@ var (
 )
 
 type unexpectedControllerStatusCode struct {
+	endpoint string
 	expected int
 	actual   int
 }
 
+func newUnexpectedControllerStatusCode(endpoint string, expectedCode, actualCode int) unexpectedControllerStatusCode {
+	return unexpectedControllerStatusCode{endpoint: endpoint, expected: expectedCode, actual: actualCode}
+}
+
 func (u unexpectedControllerStatusCode) Error() string {
-	return fmt.Sprintf("Expected status code %d from Deis controller, got %d", u.expected, u.actual)
+	return fmt.Sprintf("Deis controller endpoint %s: expected status code %d, got %d", u.endpoint, u.expected, u.actual)
 }
 
 func controllerURLStr(conf *Config, additionalPath ...string) string {

pkg/gitreceive/get_app_config.go

@@ -40,7 +40,7 @@ func getAppConfig(conf *Config, builderKey, userName, appName string) (*pkg.Conf
 	if res.StatusCode == 404 {
 		return nil, errControllerNotFound
 	} else if res.StatusCode != 200 {
-		return nil, unexpectedControllerStatusCode{expected: 200, actual: res.StatusCode}
+		return nil, newUnexpectedControllerStatusCode(url, 200, res.StatusCode)
 	}
 
 	ret := &pkg.Config{}

pkg/gitreceive/publish_release.go

@@ -36,7 +36,7 @@ func publishRelease(conf *Config, builderKey string, buildHook *pkg.BuildHook) (
 	} else if res.StatusCode == http.StatusServiceUnavailable {
 		return nil, errControllerServiceUnavailable
 	} else if res.StatusCode != 200 {
-		return nil, unexpectedControllerStatusCode{expected: 200, actual: res.StatusCode}
+		return nil, newUnexpectedControllerStatusCode(url, 200, res.StatusCode)
 	}
 
 	ret := new(pkg.BuildHookResponse)