[SAPBTPCFS-7876] Optimize handling of non-transient errors

SAP · Feb 5, 2024 · 581b415 · 581b415
1 parent 8c9cb5f
commit 581b415
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/controllers/servicebinding_controller.go b/controllers/servicebinding_controller.go
@@ -243,7 +243,7 @@ func (r *ServiceBindingReconciler) createBinding(ctx context.Context, smClient s
 
 	if bindErr != nil {
 		log.Error(err, "failed to create service binding", "serviceInstanceID", serviceInstance.Status.InstanceID)
-		return utils.HandleError(ctx, r.Client, smClientTypes.CREATE, bindErr, serviceBinding, false)
+		return utils.HandleError(ctx, r.Client, smClientTypes.CREATE, bindErr, serviceBinding, true)
 	}
 
 	if operationURL != "" {

diff --git a/controllers/servicebinding_controller_test.go b/controllers/servicebinding_controller_test.go
@@ -72,7 +72,16 @@ var _ = Describe("ServiceBinding controller", func() {
 	}
 
 	createBindingWithoutAssertions := func(ctx context.Context, name, namespace, instanceName, instanceNamespace, externalName string) (*v1.ServiceBinding, error) {
-		return createBindingWithoutAssertionsAndWait(ctx, name, namespace, instanceName, instanceNamespace, externalName, true)
+		return createBindingWithoutAssertionsAndWait(ctx, name, namespace, instanceName, instanceNamespace, externalName, false)
+	}
+
+	createBindingWithTransitError := func(ctx context.Context, name, namespace, instanceName, externalName, failureMessage string) {
+		binding, err := createBindingWithoutAssertions(ctx, name, namespace, instanceName, "", externalName)
+		if err != nil {
+			Expect(err.Error()).To(ContainSubstring(failureMessage))
+		} else {
+			waitForResourceCondition(ctx, binding, common.ConditionSucceeded, metav1.ConditionFalse, common.CreateInProgress, failureMessage)
+		}
 	}
 
 	createBindingWithError := func(ctx context.Context, name, namespace, instanceName, externalName, failureMessage string) {
@@ -200,7 +209,7 @@ var _ = Describe("ServiceBinding controller", func() {
 		Context("invalid parameters", func() {
 			When("service instance name is not provided", func() {
 				It("should fail", func() {
-					createBindingWithError(ctx, bindingName, bindingTestNamespace, "", "",
+					createBindingWithTransitError(ctx, bindingName, bindingTestNamespace, "", "",
 						"spec.serviceInstanceName in body should be at least 1 chars long")
 				})
 			})
@@ -417,7 +426,7 @@ var _ = Describe("ServiceBinding controller", func() {
 					})
 
 					It("should fail", func() {
-						createBindingWithError(ctx, bindingName, bindingTestNamespace, instanceName, "binding-external-name", errorMessage)
+						createBindingWithTransitError(ctx, bindingName, bindingTestNamespace, instanceName, "binding-external-name", errorMessage)
 					})
 				})
 
@@ -455,7 +464,7 @@ var _ = Describe("ServiceBinding controller", func() {
 					})
 
 					It("should detect the error as non-transient and fail", func() {
-						createBindingWithError(ctx, bindingName, bindingTestNamespace, instanceName, "binding-external-name", errorMessage)
+						createBindingWithTransitError(ctx, bindingName, bindingTestNamespace, instanceName, "binding-external-name", errorMessage)
 					})
 				})
 

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -252,7 +252,7 @@ func waitForResourceCondition(ctx context.Context, resource common.SAPBTPResourc
 		}
 
 		return true
-	}, timeout*2, interval).Should(BeTrue(),
+	}, timeout*3, interval).Should(BeTrue(),
 		eventuallyMsgForResource(
 			fmt.Sprintf("expected condition: {type: %s, status: %s, reason: %s, message: %s} was not met", conditionType, status, reason, message),
 			key,