[SAPBTPCFS-15469] Update Service Instance on change of 'parametersFro…

…m' secret
SAP · Dec 8, 2024 · b1e853c · b1e853c
1 parent 62240de
commit b1e853c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/api/v1/serviceinstance_types.go b/api/v1/serviceinstance_types.go
@@ -207,6 +207,6 @@ func (si *ServiceInstance) ShouldBeShared() bool {
 	return si.Spec.Shared != nil && *si.Spec.Shared
 }
 
-func (si *ServiceInstance) IsSubscribedToSecretKeyRefChange() bool {
+func (si *ServiceInstance) IsSubscribedToSecretChange() bool {
 	return si.Spec.SubscribeToSecretChanges != nil && *si.Spec.SubscribeToSecretChanges
 }
diff --git a/api/v1/serviceinstance_types_test.go b/api/v1/serviceinstance_types_test.go
@@ -123,4 +123,9 @@ var _ = Describe("Service Instance Type Test", func() {
 		instance.SetAnnotations(annotation)
 		Expect(instance.GetAnnotations()).To(Equal(annotation))
 	})
+
+	It("should update SubscribeToSecretChanges", func() {
+		instance.Spec.SubscribeToSecretChanges = &[]bool{true}[0]
+		Expect(instance.IsSubscribedToSecretChange()).To(BeTrue())
+	})
 })
diff --git a/controllers/serviceinstance_controller.go b/controllers/serviceinstance_controller.go
@@ -553,7 +553,7 @@ func (r *ServiceInstanceReconciler) buildSMRequestParameters(ctx context.Context
 		return nil, err
 	}
 	shouldUpdate := false
-	if serviceInstance.IsSubscribedToSecretKeyRefChange() {
+	if serviceInstance.IsSubscribedToSecretChange() {
 		existingSecrets := make(map[string]string)
 		if serviceInstance.Labels == nil {
 			serviceInstance.Labels = make(map[string]string)

diff --git a/controllers/serviceinstance_controller_test.go b/controllers/serviceinstance_controller_test.go
@@ -1398,7 +1398,10 @@ var _ = Describe("ServiceInstance controller", func() {
 			})
 		})
 		When("secret updated and instance don't watch secret", func() {
-			It("should update instance with the secret change", func() {
+			AfterEach(func() {
+				instanceSpec.SubscribeToSecretChanges = pointer.Bool(false)
+			})
+			It("should not update instance with the secret change", func() {
 				serviceInstance = createInstance(ctx, fakeInstanceName, instanceSpec, nil, true)
 				smInstance, _, _, _, _, _ := fakeClient.ProvisionArgsForCall(0)
 				checkParams(string(smInstance.Parameters), []string{"\"key\":\"value\"", "\"secret-key\":\"secret-value\""})
@@ -1411,6 +1414,25 @@ var _ = Describe("ServiceInstance controller", func() {
 				Expect(k8sClient.Update(ctx, paramsSecret)).To(Succeed())
 				Expect(fakeClient.UpdateInstanceCallCount()).To(Equal(0))
 			})
+			It("should not update instance with the secret change after removing SubscribeToSecretChanges", func() {
+				instanceSpec.SubscribeToSecretChanges = pointer.Bool(true)
+				serviceInstance = createInstance(ctx, fakeInstanceName, instanceSpec, nil, true)
+				smInstance, _, _, _, _, _ := fakeClient.ProvisionArgsForCall(0)
+				checkParams(string(smInstance.Parameters), []string{"\"key\":\"value\"", "\"secret-key\":\"secret-value\""})
+
+				checkSecretAnnotationsAndLabels(ctx, k8sClient, paramsSecret, []*v1.ServiceInstance{serviceInstance})
+
+				serviceInstance.Spec.SubscribeToSecretChanges = pointer.Bool(false)
+				updateInstance(ctx, serviceInstance)
+				waitForResourceCondition(ctx, serviceInstance, common.ConditionSucceeded, metav1.ConditionTrue, common.Updated, "")
+				checkSecretAnnotationsAndLabels(ctx, k8sClient, paramsSecret, []*v1.ServiceInstance{})
+
+				credentialsMap := make(map[string][]byte)
+				credentialsMap["secret-parameter"] = []byte("{\"secret-key\":\"new-secret-value\"}")
+				paramsSecret.Data = credentialsMap
+				Expect(k8sClient.Update(ctx, paramsSecret)).To(Succeed())
+				Expect(fakeClient.UpdateInstanceCallCount()).To(Equal(1))
+			})
 		})
 
 	})