Renamed service binding type label

cloudfoundry · Jan 9, 2025 · a237d98 · a237d98
1 parent 223246f
commit a237d98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/controllers/api/v1alpha1/cfservicebinding_types.go b/controllers/api/v1alpha1/cfservicebinding_types.go
@@ -34,9 +34,8 @@ const (
 	ServiceInstanceTypeAnnotationKey = "korifi.cloudfoundry.org/service-instance-type"
 	PlanGUIDLabelKey                 = "korifi.cloudfoundry.org/plan-guid"
 
-	ServiceBindingGUIDLabel           = "korifi.cloudfoundry.org/service-binding-guid"
-	ServiceCredentialBindingTypeLabel = "korifi.cloudfoundry.org/service-credential-binding-type"
-	CFServiceBindingFinalizerName     = "cfServiceBinding.korifi.cloudfoundry.org"
+	ServiceBindingGUIDLabel       = "korifi.cloudfoundry.org/service-binding-guid"
+	CFServiceBindingFinalizerName = "cfServiceBinding.korifi.cloudfoundry.org"
 )
 
 // CFServiceBindingSpec defines the desired state of CFServiceBinding

diff --git a/controllers/controllers/services/bindings/sbio/servicebinding.go b/controllers/controllers/services/bindings/sbio/servicebinding.go
@@ -16,9 +16,9 @@ func ToSBServiceBinding(cfServiceBinding *korifiv1alpha1.CFServiceBinding, bindi
 			Name:      fmt.Sprintf("cf-binding-%s", cfServiceBinding.Name),
 			Namespace: cfServiceBinding.Namespace,
 			Labels: map[string]string{
-				korifiv1alpha1.ServiceBindingGUIDLabel:           cfServiceBinding.Name,
-				korifiv1alpha1.CFAppGUIDLabelKey:                 cfServiceBinding.Spec.AppRef.Name,
-				korifiv1alpha1.ServiceCredentialBindingTypeLabel: "app",
+				korifiv1alpha1.ServiceBindingGUIDLabel: cfServiceBinding.Name,
+				korifiv1alpha1.CFAppGUIDLabelKey:       cfServiceBinding.Spec.AppRef.Name,
+				korifiv1alpha1.ServiceBindingTypeLabel: "app",
 			},
 		},
 		Spec: servicebindingv1beta1.ServiceBindingSpec{

diff --git a/controllers/controllers/services/bindings/sbio/servicebinding_test.go b/controllers/controllers/services/bindings/sbio/servicebinding_test.go
@@ -62,9 +62,9 @@ var _ = Describe("SBIO", func() {
 					Name:      "cf-binding-cf-binding",
 					Namespace: cfServiceBinding.Namespace,
 					Labels: map[string]string{
-						korifiv1alpha1.ServiceBindingGUIDLabel:           bindingName,
-						korifiv1alpha1.CFAppGUIDLabelKey:                 cfServiceBinding.Spec.AppRef.Name,
-						korifiv1alpha1.ServiceCredentialBindingTypeLabel: "app",
+						korifiv1alpha1.ServiceBindingGUIDLabel: bindingName,
+						korifiv1alpha1.CFAppGUIDLabelKey:       cfServiceBinding.Spec.AppRef.Name,
+						korifiv1alpha1.ServiceBindingTypeLabel: "app",
 					},
 				},
 				Spec: servicebindingv1beta1.ServiceBindingSpec{