use correct namespace from MR in MultiNamespacedResolution

Signed-off-by: Erhan Cagirici <[email protected]>

Author: erhancagirici

pkg/reference/namespaced_reference.go

@@ -268,7 +268,7 @@ func (r *APINamespacedResolver) ResolveMultiple(ctx context.Context, req MultiNa
 		ns = r.from.GetNamespace()
 	}
 
-	if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels), client.InNamespace(req.Namespace)); err != nil {
+	if err := r.client.List(ctx, req.To.List, client.MatchingLabels(req.Selector.MatchLabels), client.InNamespace(ns)); err != nil {
 		return MultiNamespacedResolutionResponse{}, errors.Wrap(err, errListManaged)
 	}
 

pkg/reference/namespaced_reference_test.go

@@ -461,7 +461,8 @@ func TestNamespacedResolveMultiple(t *testing.T) {
 	now := metav1.Now()
 	value := "coolv"
 	value2 := "cooler"
-	ref := xpv1.NamespacedReference{Name: "cool"}
+	ref := xpv1.NamespacedReference{Name: "cool", Namespace: "cool-ns"}
+	nsOmittedRef := xpv1.NamespacedReference{Name: "cool"}
 	optionalPolicy := xpv1.ResolutionPolicyOptional
 	alwaysPolicy := xpv1.ResolvePolicyAlways
 	optionalRef := xpv1.NamespacedReference{Name: "cool", Policy: &xpv1.Policy{Resolution: &optionalPolicy}}
@@ -616,18 +617,88 @@ func TestNamespacedResolveMultiple(t *testing.T) {
 		"SuccessfulResolveNamespaced": {
 			reason: "Resolve should be successful when a namespace is given",
 			c: &test.MockClient{
-				MockGet: test.NewMockGetFn(nil, func(obj client.Object) error {
-					meta.SetExternalName(obj.(metav1.Object), value)
-					return nil
-				}),
+				MockGet: func(_ context.Context, key client.ObjectKey, obj client.Object) error {
+					if key.Namespace == ref.Namespace {
+						meta.SetExternalName(obj.(metav1.Object), value)
+						return nil
+					}
+
+					t.Errorf("Resolve did not infer to the MR namespace: %v", key)
+					return errBoom
+				},
 			},
 			from: &fake.Managed{},
 			args: args{
 				req: MultiNamespacedResolutionRequest{
 					References: []xpv1.NamespacedReference{ref},
 					To:         To{Managed: &fake.Managed{}},
 					Extract:    ExternalName(),
-					Namespace:  "cool-ns",
+				},
+			},
+			want: want{
+				rsp: MultiNamespacedResolutionResponse{
+					ResolvedValues:     []string{value},
+					ResolvedReferences: []xpv1.NamespacedReference{ref},
+				},
+			},
+		},
+		"SuccessfulResolveInferredNamespace": {
+			reason: "Resolve should be successful when a namespace is given",
+			c: &test.MockClient{
+				MockGet: func(_ context.Context, key client.ObjectKey, obj client.Object) error {
+					if key.Namespace == "from-ns" {
+						meta.SetExternalName(obj.(metav1.Object), value)
+						return nil
+					}
+
+					t.Errorf("Resolve did not infer to the MR namespace: %v", key)
+					return errBoom
+				},
+			},
+			from: &fake.Managed{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "some-mr",
+					Namespace: "from-ns",
+				},
+			},
+			args: args{
+				req: MultiNamespacedResolutionRequest{
+					References: []xpv1.NamespacedReference{nsOmittedRef},
+					To:         To{Managed: &fake.Managed{}},
+					Extract:    ExternalName(),
+				},
+			},
+			want: want{
+				rsp: MultiNamespacedResolutionResponse{
+					ResolvedValues:     []string{value},
+					ResolvedReferences: []xpv1.NamespacedReference{nsOmittedRef},
+				},
+			},
+		},
+		"SuccessfulResolveCrossNamespace": {
+			reason: "Resolve should be successful when a namespace is given",
+			c: &test.MockClient{
+				MockGet: func(_ context.Context, key client.ObjectKey, obj client.Object) error {
+					if key.Namespace == ref.Namespace {
+						meta.SetExternalName(obj.(metav1.Object), value)
+						return nil
+					}
+
+					t.Errorf("Resolve did not infer to the MR namespace: %v", key)
+					return errBoom
+				},
+			},
+			from: &fake.Managed{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "some-mr",
+					Namespace: "from-ns",
+				},
+			},
+			args: args{
+				req: MultiNamespacedResolutionRequest{
+					References: []xpv1.NamespacedReference{ref},
+					To:         To{Managed: &fake.Managed{}},
+					Extract:    ExternalName(),
 				},
 			},
 			want: want{