Add tests for TargetRef Kind and Name Combo

Author: shaun-nx

tests/cel/common.go

@@ -46,6 +46,7 @@ const (
 
 const (
 	expectedTargetRefMustBeHTTPRouteOrGrpcRouteError = `TargetRef Kind must be: HTTPRoute or GRPCRoute`
+	expectedTargetRefKindAndNameComboMustBeUnique    = `TargetRef Kind and Name combination must be unique`
 )
 
 const (

tests/cel/observabilitypolicy_test.go

@@ -6,21 +6,21 @@ import (
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
+	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
 )
 
 func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 	t.Parallel()
 	k8sClient := getKubernetesClient(t)
 
 	tests := []struct {
-		spec       ngfAPIv1alpha1.ObservabilityPolicySpec
+		spec       ngfAPIv1alpha2.ObservabilityPolicySpec
 		name       string
 		wantErrors []string
 	}{
 		{
 			name: "Validate TargetRef of kind HTTPRoute is allowed",
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  httpRouteKind,
@@ -31,7 +31,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 		},
 		{
 			name: "Validate TargetRef of kind GRPCRoute is allowed",
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  grpcRouteKind,
@@ -43,7 +43,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 		{
 			name:       "Validate Invalid TargetRef Kind is not allowed",
 			wantErrors: []string{expectedTargetRefMustBeHTTPRouteOrGrpcRouteError},
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  invalidKind,
@@ -55,7 +55,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 		{
 			name:       "Validate TCPRoute TargetRef Kind is not allowed",
 			wantErrors: []string{expectedTargetRefMustBeHTTPRouteOrGrpcRouteError},
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  tcpRouteKind,
@@ -67,7 +67,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 		{
 			name:       "Validate TargetRef of kind Gateway is allowed",
 			wantErrors: []string{expectedTargetRefMustBeHTTPRouteOrGrpcRouteError},
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  gatewayKind,
@@ -78,7 +78,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 		},
 		{
 			name: "Validate ObservabilityPolicy is applied when one TargetRef is valid and another is invalid",
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  gatewayKind,
@@ -102,7 +102,7 @@ func TestObservabilityPoliciesTargetRefKind(t *testing.T) {
 				spec.TargetRefs[i].Name = gatewayv1alpha2.ObjectName(uniqueResourceName(testTargetRefName))
 			}
 
-			observabilityPolicy := &ngfAPIv1alpha1.ObservabilityPolicy{
+			observabilityPolicy := &ngfAPIv1alpha2.ObservabilityPolicy{
 				ObjectMeta: controllerruntime.ObjectMeta{
 					Name:      uniqueResourceName(testResourceName),
 					Namespace: defaultNamespace,
@@ -119,13 +119,13 @@ func TestObservabilityPoliciesTargetRefGroup(t *testing.T) {
 	k8sClient := getKubernetesClient(t)
 
 	tests := []struct {
-		spec       ngfAPIv1alpha1.ObservabilityPolicySpec
+		spec       ngfAPIv1alpha2.ObservabilityPolicySpec
 		name       string
 		wantErrors []string
 	}{
 		{
 			name: "Validate gateway.networking.k8s.io TargetRef Group is allowed",
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  httpRouteKind,
@@ -137,7 +137,7 @@ func TestObservabilityPoliciesTargetRefGroup(t *testing.T) {
 		{
 			name:       "Validate invalid.networking.k8s.io TargetRef Group is not allowed",
 			wantErrors: []string{expectedTargetRefGroupError},
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  httpRouteKind,
@@ -149,7 +149,7 @@ func TestObservabilityPoliciesTargetRefGroup(t *testing.T) {
 		{
 			name:       "Validate discovery.k8s.io/v1 TargetRef Group is not allowed",
 			wantErrors: []string{expectedTargetRefGroupError},
-			spec: ngfAPIv1alpha1.ObservabilityPolicySpec{
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
 				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
 					{
 						Kind:  httpRouteKind,
@@ -169,7 +169,54 @@ func TestObservabilityPoliciesTargetRefGroup(t *testing.T) {
 				spec.TargetRefs[i].Name = gatewayv1alpha2.ObjectName(uniqueResourceName(testTargetRefName))
 			}
 
-			observabilityPolicy := &ngfAPIv1alpha1.ObservabilityPolicy{
+			observabilityPolicy := &ngfAPIv1alpha2.ObservabilityPolicy{
+				ObjectMeta: controllerruntime.ObjectMeta{
+					Name:      uniqueResourceName(testResourceName),
+					Namespace: defaultNamespace,
+				},
+				Spec: spec,
+			}
+			validateCrd(t, tt.wantErrors, observabilityPolicy, k8sClient)
+		})
+	}
+}
+
+func TestObservabilityPoliciesTargetRefKindAndNameCombo(t *testing.T) {
+	t.Parallel()
+	k8sClient := getKubernetesClient(t)
+
+	tests := []struct {
+		spec       ngfAPIv1alpha2.ObservabilityPolicySpec
+		name       string
+		wantErrors []string
+	}{
+		{
+			// This test is not throwing an error like we expect it to...
+			name:       "Validate TargetRef Kind and Name combination is unique",
+			wantErrors: []string{expectedTargetRefKindAndNameComboMustBeUnique},
+			spec: ngfAPIv1alpha2.ObservabilityPolicySpec{
+				TargetRefs: []gatewayv1alpha2.LocalPolicyTargetReference{
+					{
+						Kind:  httpRouteKind,
+						Name:  gatewayv1alpha2.ObjectName(testTargetRefName),
+						Group: gatewayGroup,
+					},
+					{
+						Kind:  httpRouteKind,
+						Name:  gatewayv1alpha2.ObjectName(testTargetRefName),
+						Group: gatewayGroup,
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			spec := tt.spec
+
+			observabilityPolicy := &ngfAPIv1alpha2.ObservabilityPolicy{
 				ObjectMeta: controllerruntime.ObjectMeta{
 					Name:      uniqueResourceName(testResourceName),
 					Namespace: defaultNamespace,