clean up logic and fix message for failed poll (#1451)

pkg/controller/controller_instance.go

@@ -1496,65 +1496,54 @@ func (c *controller) pollServiceInstance(instance *v1beta1.ServiceInstance) erro
 			return err
 		}
 	case osb.StateFailed:
-		description := ""
+		description := "(no description provided)"
 		if response.Description != nil {
 			description = *response.Description
 		}
-		actionText := ""
-		switch {
-		case mitigatingOrphan:
-			actionText = "mitigating orphan"
-		case deleting:
-			actionText = "deprovisioning"
-		case provisioning:
-			actionText = "provisioning"
-		default:
-			actionText = "updating"
-		}
-		s := fmt.Sprintf(`Error %s: %q`, actionText, description)
-		c.recorder.Event(instance, corev1.EventTypeWarning, errorDeprovisionCalledReason, s)
-		glog.V(5).Infof(
-			`%s "%s/%s": %s`,
-			typeSI, instance.Namespace, instance.Name, s,
-		)
-
-		clone, err := api.Scheme.DeepCopy(instance)
-		if err != nil {
-			return err
-		}
-		toUpdate := clone.(*v1beta1.ServiceInstance)
-		c.clearServiceInstanceCurrentOperation(toUpdate)
-
 		var (
 			readyCond v1beta1.ConditionStatus
 			reason    string
-			msg       string
+			message   string
 		)
 		switch {
 		case mitigatingOrphan:
 			readyCond = v1beta1.ConditionUnknown
 			reason = errorOrphanMitigationFailedReason
-			msg = "Orphan mitigation failed: " + s
+			message = "Orphan mitigation failed: " + description
 		case deleting:
 			readyCond = v1beta1.ConditionUnknown
 			reason = errorDeprovisionCalledReason
-			msg = "Deprovision call failed: " + s
+			message = "Deprovision call failed: " + description
 		case provisioning:
 			readyCond = v1beta1.ConditionFalse
 			reason = errorProvisionCallFailedReason
-			msg = "Provision call failed: " + s
+			message = "Provision call failed: " + description
 		default:
 			readyCond = v1beta1.ConditionFalse
 			reason = errorUpdateInstanceCallFailedReason
-			msg = "Update call failed: " + s
+			message = "Update call failed: " + description
 		}
 
+		c.recorder.Event(instance, corev1.EventTypeWarning, reason, message)
+		glog.V(5).Infof(
+			`%s "%s/%s": %s`,
+			typeSI, instance.Namespace, instance.Name, message,
+		)
+
+		clone, err := api.Scheme.DeepCopy(instance)
+		if err != nil {
+			return err
+		}
+		toUpdate := clone.(*v1beta1.ServiceInstance)
+
+		c.clearServiceInstanceCurrentOperation(toUpdate)
+
 		setServiceInstanceCondition(
 			toUpdate,
 			v1beta1.ServiceInstanceConditionReady,
 			readyCond,
 			reason,
-			msg,
+			message,
 		)
 
 		if !mitigatingOrphan {
@@ -1563,18 +1552,15 @@ func (c *controller) pollServiceInstance(instance *v1beta1.ServiceInstance) erro
 				v1beta1.ServiceInstanceConditionFailed,
 				v1beta1.ConditionTrue,
 				reason,
-				msg,
+				message,
 			)
 		}
 
 		if _, err := c.updateServiceInstanceStatus(toUpdate); err != nil {
 			return err
 		}
 
-		err = c.finishPollingServiceInstance(instance)
-		if err != nil {
-			return err
-		}
+		return c.finishPollingServiceInstance(instance)
 	default:
 		glog.Warningf(
 			`%s "%s/%s": Got invalid state in LastOperationResponse: %q`,

pkg/controller/controller_instance_test.go

@@ -2041,7 +2041,7 @@ func TestPollServiceInstanceFailureDeprovisioningWithOperation(t *testing.T) {
 
 	events := getRecordedEvents(testController)
 	assertNumEvents(t, events, 1)
-	expectedEvent := corev1.EventTypeWarning + " " + errorDeprovisionCalledReason + " " + "Error deprovisioning: \"\""
+	expectedEvent := corev1.EventTypeWarning + " " + errorDeprovisionCalledReason + " " + "Deprovision call failed: (no description provided)"
 	if e, a := expectedEvent, events[0]; e != a {
 		t.Fatalf("Received unexpected event: %v\nExpected: %v", a, e)
 	}