clean up error logging (#1443)

openshift · Oct 20, 2017 · 117bfbd · 117bfbd
1 parent dff470f
commit 117bfbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pkg/controller/controller_instance.go b/pkg/controller/controller_instance.go
@@ -1251,10 +1251,7 @@ func (c *controller) pollServiceInstance(instance *v1beta1.ServiceInstance) erro
 		// the instance.
 		errText := ""
 		if httpErr, ok := osb.IsHTTPError(err); ok {
-			errText = fmt.Sprintf(
-				"Status code: %d; ErrorMessage: %q; description: %q",
-				httpErr.StatusCode, httpErr.ErrorMessage, httpErr.Description,
-			)
+			errText = httpErr.Error()
 		} else {
 			errText = err.Error()
 		}

diff --git a/pkg/controller/controller_instance_test.go b/pkg/controller/controller_instance_test.go
@@ -2065,7 +2065,7 @@ func TestPollServiceInstanceClusterServiceBrokerError(t *testing.T) {
 
 	events := getRecordedEvents(testController)
 	assertNumEvents(t, events, 1)
-	expectedEvent := corev1.EventTypeWarning + " " + errorPollingLastOperationReason + " " + "Error polling last operation: Status code: 403; ErrorMessage: %!q(*string=<nil>); description: %!q(*string=<nil>)"
+	expectedEvent := corev1.EventTypeWarning + " " + errorPollingLastOperationReason + " " + "Error polling last operation: Status: 403; ErrorMessage: <nil>; Description: <nil>; ResponseError: <nil>"
 	if e, a := expectedEvent, events[0]; e != a {
 		t.Fatalf("Received unexpected event: %v\nExpected: %v", a, e)
 	}