Refactor build section name refs

Author: Sarthak Agrawal

internal/controller/state/graph/graph_test.go

@@ -776,32 +776,6 @@ func TestBuildGraph(t *testing.T) {
 		Attachable: true,
 		Source:     tr,
 		ParentRefs: []ParentRef{
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					AcceptedHostnames: map[string][]string{},
-					Attached:          false,
-					FailedConditions:  []conditions.Condition{conditions.NewRouteNotAllowedByListeners()},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[0].Name,
-			},
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					AcceptedHostnames: map[string][]string{},
-					Attached:          false,
-					FailedConditions:  []conditions.Condition{conditions.NewRouteNotAllowedByListeners()},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[1].Name,
-			},
 			{
 				Idx: 0,
 				Gateway: &ParentRefGateway{
@@ -815,26 +789,13 @@ func TestBuildGraph(t *testing.T) {
 							client.ObjectKeyFromObject(gw1.Source),
 							"listener-443-2",
 						): {"fizz.example.org"},
-					},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[2].Name,
-			},
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					Attached: true,
-					AcceptedHostnames: map[string][]string{
 						CreateGatewayListenerKey(
 							client.ObjectKeyFromObject(gw1.Source),
 							"listener-8443",
 						): {"fizz.example.org"},
 					},
 				},
-				SectionName: &gw1.Source.Spec.Listeners[3].Name,
+				SectionName: nil, // No expansion - represents attachment to all listeners
 			},
 		},
 		Spec: L4RouteSpec{
@@ -858,45 +819,6 @@ func TestBuildGraph(t *testing.T) {
 		Attachable: true,
 		Source:     tr2,
 		ParentRefs: []ParentRef{
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					Attached:          false,
-					AcceptedHostnames: map[string][]string{},
-					FailedConditions:  []conditions.Condition{conditions.NewRouteNotAllowedByListeners()},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[0].Name,
-			},
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					AcceptedHostnames: map[string][]string{},
-					Attached:          false,
-					FailedConditions:  []conditions.Condition{conditions.NewRouteNotAllowedByListeners()},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[1].Name,
-			},
-			{
-				Idx: 0,
-				Gateway: &ParentRefGateway{
-					NamespacedName:      client.ObjectKeyFromObject(gw1.Source),
-					EffectiveNginxProxy: np1Effective,
-				},
-				Attachment: &ParentRefAttachmentStatus{
-					Attached:          false,
-					AcceptedHostnames: map[string][]string{},
-					FailedConditions:  []conditions.Condition{conditions.NewRouteHostnameConflict()},
-				},
-				SectionName: &gw1.Source.Spec.Listeners[2].Name,
-			},
 			{
 				Idx: 0,
 				Gateway: &ParentRefGateway{
@@ -908,7 +830,7 @@ func TestBuildGraph(t *testing.T) {
 					AcceptedHostnames: map[string][]string{},
 					FailedConditions:  []conditions.Condition{conditions.NewRouteHostnameConflict()},
 				},
-				SectionName: &gw1.Source.Spec.Listeners[3].Name,
+				SectionName: nil, // No expansion - represents attachment to all listeners
 			},
 		},
 		Spec: L4RouteSpec{

internal/controller/state/graph/route_common.go

@@ -303,47 +303,36 @@ func buildSectionNameRefs(
 		}
 
 		gwNsName := client.ObjectKeyFromObject(gw.Source)
-		k := key{
-			gwNsName: gwNsName,
-		}
 
-		// If there is no section name, handle based on whether port is specified
-		// FIXME(sarthyparty): this logic seems to be duplicated in findAttachableListeners so we should refactor this,
-		// either here or in findAttachableListeners
+		// If there is no section name, validate uniqueness by expanding in the uniqueness map only
 		if p.SectionName == nil {
-			// If port is specified, preserve the port-only nature for proper validation
-			if p.Port != nil {
-				sectionNameRefs = append(sectionNameRefs, ParentRef{
-					Idx:         i,
-					Gateway:     CreateParentRefGateway(gw),
-					SectionName: nil, // Keep as nil to preserve port-only semantics
-					Port:        p.Port,
-				})
-			} else {
-				// If no port and no sectionName, expand to all listeners
-				for _, l := range gw.Listeners {
-					k.sectionName = string(l.Source.Name)
-
-					if err := checkUniqueSections(k); err != nil {
-						return nil, err
-					}
+			// Check uniqueness for all listener names in this gateway
+			for _, l := range gw.Listeners {
+				k := key{
+					gwNsName:    gwNsName,
+					sectionName: string(l.Source.Name),
+				}
 
-					sectionNameRefs = append(sectionNameRefs, ParentRef{
-						// if the ParentRefs we create are for each listener in the same gateway, we keep the
-						// parentRefIndex the same so when we look at a route's parentRef's we can see
-						// if the parentRef is a unique parentRef or one we created internally
-						Idx:         i,
-						Gateway:     CreateParentRefGateway(gw),
-						SectionName: &l.Source.Name,
-						Port:        nil,
-					})
+				if err := checkUniqueSections(k); err != nil {
+					return nil, err
 				}
 			}
 
+			// Create a single parentRef without expansion
+			sectionNameRefs = append(sectionNameRefs, ParentRef{
+				Idx:         i,
+				Gateway:     CreateParentRefGateway(gw),
+				SectionName: nil, // Keep as nil to indicate attachment to multiple listeners
+				Port:        p.Port,
+			})
+
 			continue
 		}
 
-		k.sectionName = string(*p.SectionName)
+		k := key{
+			gwNsName:    gwNsName,
+			sectionName: string(*p.SectionName),
+		}
 		if err := checkUniqueSections(k); err != nil {
 			return nil, err
 		}

internal/controller/state/graph/route_common_test.go

@@ -121,12 +121,7 @@ func TestBuildSectionNameRefs(t *testing.T) {
 		{
 			Idx:         6,
 			Gateway:     CreateParentRefGateway(gws[gwNsName3]),
-			SectionName: helpers.GetPointer[gatewayv1.SectionName]("http"),
-		},
-		{
-			Idx:         6,
-			Gateway:     CreateParentRefGateway(gws[gwNsName3]),
-			SectionName: helpers.GetPointer[gatewayv1.SectionName]("https"),
+			SectionName: nil, // No expansion - keep as nil to represent attachment to all listeners
 		},
 	}