From 359f9e70b5b4f905c4e8c34ba191141f7aba186d Mon Sep 17 00:00:00 2001
From: Yusmen Zabanov <yusmen.zabanov@sap.com>
Date: Wed, 25 Sep 2024 14:02:00 +0000
Subject: [PATCH] WIP

---
 .../services/instances/managed/controller.go  | 16 ++++++-------
 .../instances/managed/controller_test.go      | 24 -------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/controllers/controllers/services/instances/managed/controller.go b/controllers/controllers/services/instances/managed/controller.go
index a2cb3e6bd..a0095db4a 100644
--- a/controllers/controllers/services/instances/managed/controller.go
+++ b/controllers/controllers/services/instances/managed/controller.go
@@ -97,6 +97,14 @@ func (r *Reconciler) ReconcileResource(ctx context.Context, serviceInstance *kor
 		return r.finalizeCFServiceInstance(ctx, serviceInstance)
 	}
 
+	if isReady(serviceInstance) {
+		return ctrl.Result{}, nil
+	}
+
+	if isFailed(serviceInstance) {
+		return ctrl.Result{}, k8s.NewNotReadyError().WithReason("ProvisioningFailed").WithNoRequeue()
+	}
+
 	servicePlan, err := r.getServicePlan(ctx, serviceInstance.Spec.PlanGUID)
 	if err != nil {
 		log.Error(err, "failed to get service plan")
@@ -121,14 +129,6 @@ func (r *Reconciler) ReconcileResource(ctx context.Context, serviceInstance *kor
 		return ctrl.Result{}, fmt.Errorf("failed to create client for broker %q: %w", serviceBroker.Name, err)
 	}
 
-	if isReady(serviceInstance) {
-		return ctrl.Result{}, nil
-	}
-
-	if isFailed(serviceInstance) {
-		return ctrl.Result{}, k8s.NewNotReadyError().WithReason("ProvisioningFailed").WithNoRequeue()
-	}
-
 	if !isProvisionRequested(serviceInstance) {
 		return r.provisionServiceInstance(ctx, osbapiClient, serviceInstance, servicePlan, serviceOffering)
 	}
diff --git a/controllers/controllers/services/instances/managed/controller_test.go b/controllers/controllers/services/instances/managed/controller_test.go
index bfc77ebbf..fe0f8a5fc 100644
--- a/controllers/controllers/services/instances/managed/controller_test.go
+++ b/controllers/controllers/services/instances/managed/controller_test.go
@@ -503,9 +503,6 @@ var _ = Describe("CFServiceInstance", func() {
 			brokerClient.DeprovisionReturns(osbapi.ServiceInstanceOperationResponse{
 				Operation: "deprovision-op",
 			}, nil)
-			brokerClient.GetServiceInstanceLastOperationReturns(osbapi.LastOperationResponse{
-				State: "in progress",
-			}, nil)
 		})
 
 		JustBeforeEach(func() {
@@ -531,12 +528,6 @@ var _ = Describe("CFServiceInstance", func() {
 			}).Should(Succeed())
 		})
 
-		It("does not delete the service instance", func() {
-			Consistently(func(g Gomega) {
-				g.Expect(adminClient.Get(ctx, client.ObjectKeyFromObject(instance), instance)).To(Succeed())
-			}).Should(Succeed())
-		})
-
 		When("deprovision fails", func() {
 			BeforeEach(func() {
 				brokerClient.DeprovisionReturns(osbapi.ServiceInstanceOperationResponse{}, errors.New("deprovision-failed"))
@@ -553,21 +544,6 @@ var _ = Describe("CFServiceInstance", func() {
 				}).Should(Succeed())
 			})
 		})
-
-		When("deprovision operation completes", func() {
-			BeforeEach(func() {
-				brokerClient.GetServiceInstanceLastOperationReturns(osbapi.LastOperationResponse{
-					State: "succeeded",
-				}, nil)
-			})
-
-			It("deletes the instance", func() {
-				Eventually(func(g Gomega) {
-					err := adminClient.Get(ctx, client.ObjectKeyFromObject(instance), instance)
-					g.Expect(k8serrors.IsNotFound(err)).To(BeTrue())
-				}).Should(Succeed())
-			})
-		})
 	})
 
 	When("the service instance is user-provided", func() {