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

…m' secret
SAP · Dec 5, 2024 · ef63f3e · ef63f3e
1 parent 7953510
commit ef63f3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/config/samples/services_v1_serviceinstance.yaml b/config/samples/services_v1_serviceinstance.yaml
@@ -2,17 +2,14 @@ apiVersion: services.cloud.sap.com/v1
 kind: ServiceInstance
 metadata:
   name: sample-instance-1
-  labels:
-    "services.cloud.sap.com/secretKeyRef-my-secret": "true"
-    "services.cloud.sap.com/secretKeyRef-my-secret1": "true"
 spec:
   serviceOfferingName: service-manager
   servicePlanName: subaccount-audit
   parametersFrom:
     - secretKeyRef:
         name: my-secret
-        key: secret-paramete
+        key: secret-parameter
     - secretKeyRef:
         name: my-secret1
-        key: secret-paramete
+        key: secret-parameter
 
diff --git a/controllers/serviceinstance_controller_test.go b/controllers/serviceinstance_controller_test.go
@@ -1291,9 +1291,7 @@ var _ = Describe("ServiceInstance controller", func() {
 				instanceSpec.SubscribeToSecretChanges = pointer.Bool(true)
 				serviceInstance = createInstance(ctx, fakeInstanceName, instanceSpec, nil, true)
 				smInstance, _, _, _, _, _ := fakeClient.ProvisionArgsForCall(0)
-				params := smInstance.Parameters
-				Expect(params).To(ContainSubstring("\"key\":\"value\""))
-				Expect(params).To(ContainSubstring("\"secret-key\":\"secret-value\""))
+				checkParams(string(smInstance.Parameters), []string{"\"key\":\"value\"", "\"secret-key\":\"secret-value\""})
 
 				checkSecretAnnotationsAndLabels(ctx, k8sClient, paramsSecret, []*v1.ServiceInstance{serviceInstance})
 
@@ -1306,9 +1304,7 @@ var _ = Describe("ServiceInstance controller", func() {
 				}, timeout*3, interval).Should(BeTrue(), "expected condition was not met")
 
 				_, smInstance, _, _, _, _, _ = fakeClient.UpdateInstanceArgsForCall(0)
-				params = smInstance.Parameters
-				Expect(params).To(ContainSubstring("\"key\":\"value\""))
-				Expect(params).To(ContainSubstring("\"secret-key\":\"new-secret-value\""))
+				checkParams(string(smInstance.Parameters), []string{"\"key\":\"value\"", "\"secret-key\":\"new-secret-value\""})
 				deleteAndWait(ctx, serviceInstance)
 				checkSecretAnnotationsAndLabels(ctx, k8sClient, paramsSecret, []*v1.ServiceInstance{})
 			})