fix bind injection failure not being persisted in API server (openshift#1546)

* fix bind injection failure not being persisted in API server

* have external properties match in-progress properties while injection fails

Author: kibbles-n-bytes

Diff for: pkg/controller/controller_binding.go

@@ -540,7 +540,6 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
 		// request, so this is what the Broker knows about the state of the
 		// binding.
 		toUpdate.Status.ExternalProperties = toUpdate.Status.InProgressProperties
-		toUpdate.Status.InProgressProperties = nil
 
 		err = c.injectServiceBinding(binding, response.Credentials)
 		if err != nil {
@@ -1493,7 +1492,6 @@ func (c *controller) pollServiceBinding(binding *v1beta1.ServiceBinding) error {
 		// Update the in progress/external properties, as the changes have been
 		// persisted in the broker
 		binding.Status.ExternalProperties = binding.Status.InProgressProperties
-		binding.Status.InProgressProperties = nil
 
 		getBindingRequest := &osb.GetBindingRequest{
 			InstanceID: instance.Spec.ExternalID,

Diff for: pkg/controller/controller_binding_test.go

@@ -338,7 +338,7 @@ func TestReconcileServiceBindingWithSecretConflict(t *testing.T) {
 	assertServiceBindingCurrentOperation(t, updatedServiceBinding, v1beta1.ServiceBindingOperationBind)
 	assertServiceBindingOperationStartTimeSet(t, updatedServiceBinding, true)
 	assertServiceBindingReconciledGeneration(t, updatedServiceBinding, binding.Status.ReconciledGeneration)
-	assertServiceBindingInProgressPropertiesNil(t, updatedServiceBinding)
+	assertServiceBindingInProgressPropertiesParameters(t, updatedServiceBinding, nil, "")
 	// External properties are updated because the bind request with the Broker was successful
 	assertServiceBindingExternalPropertiesParameters(t, updatedServiceBinding, nil, "")
 	assertServiceBindingOrphanMitigationSet(t, updatedServiceBinding, false)
@@ -2116,7 +2116,6 @@ func TestReconcileBindingWithSecretConflictFailedAfterFinalRetry(t *testing.T) {
 	assertServiceBindingCondition(t, updatedServiceBinding, v1beta1.ServiceBindingConditionReady, v1beta1.ConditionFalse, errorServiceBindingOrphanMitigation)
 	assertServiceBindingCondition(t, updatedServiceBinding, v1beta1.ServiceBindingConditionFailed, v1beta1.ConditionTrue, errorReconciliationRetryTimeoutReason)
 	assertServiceBindingStartingOrphanMitigation(t, updatedServiceBinding, binding)
-	assertServiceBindingInProgressPropertiesNil(t, updatedServiceBinding)
 	assertServiceBindingExternalPropertiesParameters(t, updatedServiceBinding, nil, "")
 
 	kubeActions := fakeKubeClient.Actions()
@@ -2478,13 +2477,14 @@ func TestReconcileBindingWithSetOrphanMitigation(t *testing.T) {
 
 			updatedServiceBinding = assertUpdateStatus(t, actions[1], binding).(*v1beta1.ServiceBinding)
 
+			assertServiceBindingExternalPropertiesNil(t, updatedServiceBinding)
+
 			if tc.setOrphanMitigation {
 				assertServiceBindingStartingOrphanMitigation(t, updatedServiceBinding, binding)
 			} else {
 				assertServiceBindingReadyFalse(t, updatedServiceBinding)
 				assertServiceBindingCondition(t, updatedServiceBinding, v1beta1.ServiceBindingConditionReady, v1beta1.ConditionFalse)
-				assertServiceBindingOrphanMitigationSet(t, updatedServiceBinding, tc.setOrphanMitigation)
-				assertServiceBindingExternalPropertiesNil(t, updatedServiceBinding)
+				assertServiceBindingOrphanMitigationSet(t, updatedServiceBinding, false)
 			}
 		})
 	}

Diff for: pkg/controller/controller_test.go

@@ -2490,6 +2490,7 @@ func assertServiceBindingStartingOrphanMitigation(t *testing.T, obj runtime.Obje
 	assertServiceBindingOperationStartTimeSet(t, obj, false)
 	assertServiceBindingReconciledGeneration(t, obj, originalBinding.Status.ReconciledGeneration)
 	assertServiceBindingOrphanMitigationSet(t, obj, true)
+	assertServiceBindingInProgressPropertiesParameters(t, obj, nil, "")
 	assertServiceBindingUnbindStatus(t, obj, v1beta1.ServiceBindingUnbindStatusRequired)
 }
 
@@ -2575,8 +2576,8 @@ func assertServiceBindingAsyncBindErrorAfterStateSucceeded(t *testing.T, obj run
 	assertServiceBindingOperationStartTimeSet(t, obj, false)
 	assertServiceBindingReconciledGeneration(t, obj, originalBinding.Status.ReconciledGeneration)
 	assertServiceBindingExternalPropertiesParameters(t, obj, nil, "")
-	assertServiceBindingInProgressPropertiesNil(t, obj)
 	assertServiceBindingUnbindStatus(t, obj, v1beta1.ServiceBindingUnbindStatusRequired)
+	assertServiceBindingInProgressPropertiesParameters(t, obj, nil, "")
 	assertCatalogFinalizerExists(t, obj)
 }