Address comments

cloudfoundry · Nov 26, 2024 · 35a1f9b · 35a1f9b
1 parent b0f67f4
commit 35a1f9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/api/repositories/service_instance_repository.go b/api/repositories/service_instance_repository.go
@@ -485,7 +485,7 @@ func (r *ServiceInstanceRepo) DeleteServiceInstance(ctx context.Context, authInf
 			return ServiceInstanceRecord{}, fmt.Errorf("failed to remove finalizer for service instance: %s, %w", message.GUID, apierrors.FromK8sError(err, ServiceInstanceResourceType))
 		}
 
-		if err = r.DeleteServiceBindings(ctx, userClient, namespace, message.GUID); err != nil {
+		if err = r.removeBindingsFinalizer(ctx, userClient, namespace, message.GUID); err != nil {
 			return ServiceInstanceRecord{}, fmt.Errorf("failed delete related service bindings for instance: %s, %w", message.GUID, apierrors.FromK8sError(err, ServiceBindingResourceType))
 		}
 	}
@@ -522,7 +522,7 @@ func (r *ServiceInstanceRepo) GetDeletedAt(ctx context.Context, authInfo authori
 	return serviceInstance.DeletedAt, nil
 }
 
-func (r *ServiceInstanceRepo) DeleteServiceBindings(ctx context.Context, userClient client.WithWatch, namespace, instanceGUID string) error {
+func (r *ServiceInstanceRepo) removeBindingsFinalizer(ctx context.Context, userClient client.WithWatch, namespace, instanceGUID string) error {
 	serviceBindings := new(korifiv1alpha1.CFServiceBindingList)
 	if err := userClient.List(ctx, serviceBindings, client.InNamespace(namespace)); err != nil {
 		return fmt.Errorf("failed to get service bindings: %w", apierrors.FromK8sError(err, ServiceBindingResourceType))

diff --git a/api/repositories/service_instance_repository_test.go b/api/repositories/service_instance_repository_test.go
@@ -1043,6 +1043,9 @@ var _ = Describe("ServiceInstanceRepository", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      uuid.NewString(),
 					Namespace: space.Name,
+					Finalizers: []string{
+						korifiv1alpha1.CFServiceBindingFinalizerName,
+					},
 				},
 				Spec: korifiv1alpha1.CFServiceBindingSpec{
 					Service: corev1.ObjectReference{
@@ -1055,8 +1058,6 @@ var _ = Describe("ServiceInstanceRepository", func() {
 					},
 				},
 			}
-
-			serviceBinding.Finalizers = append(serviceBinding.Finalizers, korifiv1alpha1.CFServiceBindingFinalizerName)
 			Expect(k8sClient.Create(ctx, serviceBinding)).To(Succeed())
 
 			deleteMessage = repositories.DeleteServiceInstanceMessage{