Fix namedResource->namedResources

Signed-off-by: Mangirdas Judeikis <mangirdas@judeikis.lt>
On-behalf-of: @SAP mangirdas.judeikis@sap.com

Author: mjudeikis

pkg/konnector/controllers/cluster/claimedresources/claimedresources_controller.go

@@ -374,7 +374,7 @@ func (c *controller) enqueueServiceNamespace(logger klog.Logger, obj interface{}
 	// We need to list all the object which might not got synced at consumer side too:
 	var sel labels.Selector
 	switch v := c.claim.Selector; {
-	case v.LabelSelector == nil && len(v.NamedResource) == 0:
+	case v.LabelSelector == nil && len(v.NamedResources) == 0:
 		sel = labels.Everything()
 	case v.LabelSelector != nil:
 		var err error
@@ -383,9 +383,9 @@ func (c *controller) enqueueServiceNamespace(logger klog.Logger, obj interface{}
 			runtime.HandleError(err)
 			return
 		}
-	case len(v.NamedResource) > 0:
+	case len(v.NamedResources) > 0:
 		// namedResource-only: fetch specific objects from cache and enqueue
-		for _, nr := range v.NamedResource {
+		for _, nr := range v.NamedResources {
 			// Build consumer cache key; empty namespace implies cluster-scoped
 			key := nr.Name
 			if nr.Namespace != "" {

pkg/resources/resources.go

@@ -30,7 +30,7 @@ func IsClaimed(selector kubebindv1alpha2.Selector, obj *unstructured.Unstructure
 		return false
 	}
 	// Empty selector selects everything
-	if selector.LabelSelector == nil && len(selector.NamedResource) == 0 {
+	if selector.LabelSelector == nil && len(selector.NamedResources) == 0 {
 		return true
 	}
 
@@ -52,9 +52,9 @@ func IsClaimed(selector kubebindv1alpha2.Selector, obj *unstructured.Unstructure
 	}
 
 	// Check named resources if specified
-	if len(selector.NamedResource) > 0 {
+	if len(selector.NamedResources) > 0 {
 		namedResourceMatches = false // Default to false, must match at least one
-		for _, nr := range selector.NamedResource {
+		for _, nr := range selector.NamedResources {
 			if nr.Namespace != "" && nr.Namespace != obj.GetNamespace() {
 				continue
 			}

pkg/resources/resources_test.go

@@ -95,7 +95,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 		{
 			name: "named resource selector should match exact name and namespace",
 			selector: kubebindv1alpha2.Selector{
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-obj",
 						Namespace: "test-ns",
@@ -115,7 +115,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 		{
 			name: "named resource selector should match name when namespace is empty",
 			selector: kubebindv1alpha2.Selector{
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-obj",
 						Namespace: "",
@@ -135,7 +135,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 		{
 			name: "named resource selector should not match different name",
 			selector: kubebindv1alpha2.Selector{
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "other-obj",
 						Namespace: "test-ns",
@@ -155,7 +155,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 		{
 			name: "named resource selector should not match different namespace",
 			selector: kubebindv1alpha2.Selector{
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-obj",
 						Namespace: "other-ns",
@@ -175,7 +175,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 		{
 			name: "named resource selector should match one of multiple resources",
 			selector: kubebindv1alpha2.Selector{
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "other-obj",
 						Namespace: "test-ns",
@@ -223,7 +223,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 						"app": "test",
 					},
 				},
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-obj",
 						Namespace: "test-ns",
@@ -251,7 +251,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 						"app": "different",
 					},
 				},
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-obj",
 						Namespace: "test-ns",
@@ -279,7 +279,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 						"app": "test",
 					},
 				},
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "other-obj",
 						Namespace: "test-ns",
@@ -307,7 +307,7 @@ func TestSelector_IsClaimed(t *testing.T) {
 						"app": "secrets",
 					},
 				},
-				NamedResource: []kubebindv1alpha2.NamedResource{
+				NamedResources: []kubebindv1alpha2.NamedResource{
 					{
 						Name:      "test-secret",
 						Namespace: "default",