Rename and add test

apis/v1/grpcroute_types.go

@@ -143,7 +143,7 @@ type GRPCRouteSpec struct {
 	//
 	// +optional
 	// +kubebuilder:validation:MaxItems=16
-	// +kubebuilder:validation:XValidation:message="Route name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
+	// +kubebuilder:validation:XValidation:message="Rule name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
 	Rules []GRPCRouteRule `json:"rules,omitempty"`
 }
 

apis/v1/httproute_types.go

@@ -117,7 +117,7 @@ type HTTPRouteSpec struct {
 	// Rules are a list of HTTP matchers, filters and actions.
 	//
 	// +optional
-	// +kubebuilder:validation:XValidation:message="Route name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
+	// +kubebuilder:validation:XValidation:message="Rule name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
 	// +kubebuilder:validation:MaxItems=16
 	// +kubebuilder:default={{matches: {{path: {type: "PathPrefix", value: "/"}}}}}
 	Rules []HTTPRouteRule `json:"rules,omitempty"`

apis/v1alpha2/tcproute_types.go

@@ -49,7 +49,7 @@ type TCPRouteSpec struct {
 	//
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=16
-	// +kubebuilder:validation:XValidation:message="Route name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
+	// +kubebuilder:validation:XValidation:message="Rule name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
 	Rules []TCPRouteRule `json:"rules"`
 }
 

apis/v1alpha2/tlsroute_types.go

@@ -90,7 +90,7 @@ type TLSRouteSpec struct {
 	//
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=16
-	// +kubebuilder:validation:XValidation:message="Route name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
+	// +kubebuilder:validation:XValidation:message="Rule name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
 	Rules []TLSRouteRule `json:"rules"`
 }
 

apis/v1alpha2/udproute_types.go

@@ -49,7 +49,7 @@ type UDPRouteSpec struct {
 	//
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=16
-	// +kubebuilder:validation:XValidation:message="Route name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
+	// +kubebuilder:validation:XValidation:message="Rule name must be unique within the route",rule="self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name) && l1.name == l2.name))"
 	Rules []UDPRouteRule `json:"rules"`
 }
 

pkg/test/cel/httproute_test.go

@@ -1211,7 +1211,7 @@ func TestHTTPRouteRule(t *testing.T) {
 		},
 		{
 			name:       "invalid because multiple names are repeated",
-			wantErrors: []string{"Route name must be unique within the route"},
+			wantErrors: []string{"Rule name must be unique within the route"},
 			rules: []gatewayv1.HTTPRouteRule{
 				{
 					Name: ptrTo(gatewayv1.SectionName("name1")),
@@ -1221,6 +1221,17 @@ func TestHTTPRouteRule(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:       "valid because names are unique",
+			wantErrors: nil,
+			rules: []gatewayv1.HTTPRouteRule{
+				// Ok to have multiple nil
+				{Name: nil},
+				{Name: nil},
+				{Name: ptrTo(gatewayv1.SectionName("name1"))},
+				{Name: ptrTo(gatewayv1.SectionName("name2"))},
+			},
+		},
 	}
 
 	for _, tc := range tests {