apply review suggestions

Author: randmonkey

controller/hybridgateway/route/status.go

@@ -422,7 +422,7 @@ func getSpecHostnames[T gwtypes.SupportedRoute](route T) []gwtypes.Hostname {
 // This function provides granular feedback for each resource type, allowing users to see exactly which
 // resources are not programmed and why, improving troubleshooting and status visibility.
 func BuildProgrammedCondition[T gwtypes.SupportedRoute, TPtr gwtypes.SupportedRoutePtr[T]](
-	ctx context.Context, logger logr.Logger, cl client.Client, route *gwtypes.HTTPRoute,
+	ctx context.Context, logger logr.Logger, cl client.Client, route TPtr,
 	pRef gwtypes.ParentReference, expectedGVKs []schema.GroupVersionKind) ([]metav1.Condition, error) {
 	var conditions []metav1.Condition
 	am := metadata.NewAnnotationManager(logger)
@@ -453,7 +453,7 @@ func BuildProgrammedCondition[T gwtypes.SupportedRoute, TPtr gwtypes.SupportedRo
 			// Check if the item is programmed.
 			prog := isProgrammed(&item)
 			log.Debug(logger, "Resource programmed status", "gvk", gvk.String(), "name", item.GetName(), "namespace", item.GetNamespace(), "programmed", prog)
-			conditions = append(conditions, *SetConditionMeta(GetProgrammedConditionForGVK(gvk, prog), route))
+			conditions = append(conditions, *SetConditionMeta[T](GetProgrammedConditionForGVK(gvk, prog), route))
 		}
 	}
 
@@ -554,7 +554,7 @@ func BuildResolvedRefsConditionForHTTPRoute(ctx context.Context, logger logr.Log
 	return SetConditionMeta(*cond, route), nil
 }
 
-// backendRefResolvedCondition returns the ResolvedRefs condition of the route according to the status of the given banckendRef in the route.
+// backendRefResolvedCondition returns the ResolvedRefs condition of the route according to the status of the given backendRef in the route.
 //
 // Parameters:
 //   - ctx: Context for API calls

controller/hybridgateway/route/status_test.go

@@ -1840,7 +1840,7 @@ func TestIsRouteReferenceGranted(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := IsRouteReferenceGranted(tt.grantSpec, tt.backendRef.BackendRef, "HTTPRoute", tt.fromNamespace)
 			if got != tt.want {
-				t.Errorf("IsHTTPReferenceGranted() = %v, want %v", got, tt.want)
+				t.Errorf("IsRouteReferenceGranted() = %v, want %v", got, tt.want)
 			}
 		})
 	}

controller/hybridgateway/target/target.go

@@ -303,7 +303,7 @@ func filterValidBackendRefs(
 
 		// Check ReferenceGrant permission for cross-namespace access.
 		if bRefNamespace != httpRoute.Namespace {
-			permitted, found, err := route.CheckReferenceGrant(ctx, cl, &bRef.BackendRef, httpRoute.Kind, httpRoute.Namespace)
+			permitted, found, err := route.CheckReferenceGrant(ctx, cl, &bRef.BackendRef, httpRoute.GetObjectKind().GroupVersionKind().Kind, httpRoute.Namespace)
 			if err != nil {
 				return nil, fmt.Errorf("error checking ReferenceGrant for BackendRef %s: %w", bRef.Name, err)
 			}

controller/hybridgateway/watch/mapfuncs_gateway_route.go

@@ -20,7 +20,7 @@ import (
 // This file is for map functions shared by all supported routes in gateway APIs.
 
 // kongResource is a type constraint that encompasses all Kong resource types
-// that can be mapped back to HTTPRoutes via annotations.
+// that can be mapped back to routes with supported type via annotations.
 type kongResource interface {
 	*configurationv1alpha1.KongUpstream |
 		*configurationv1alpha1.KongTarget |
@@ -31,7 +31,7 @@ type kongResource interface {
 }
 
 // MapRouteForKongResource returns a handler.MapFunc that, given a Kong resource object of type T,
-// retrieves the routesreferenced in its annotations. It returns a slice of reconcile.Requests
+// retrieves the routes referenced in its annotations. It returns a slice of reconcile.Requests
 // for each matching route.
 func MapRouteForKongResource[T kongResource](cl client.Client) handler.MapFunc {
 	return func(ctx context.Context, obj client.Object) []reconcile.Request {

controller/hybridgateway/watch/mapfuncs_gateway_route_test.go

@@ -246,6 +246,7 @@ func Test_MapRouteForService(t *testing.T) {
 					BackendRef: gwtypes.BackendRef{
 						BackendObjectReference: gwtypes.BackendObjectReference{
 							Name: gatewayv1.ObjectName("test-svc"),
+							Port: new(gatewayv1.PortNumber(80)),
 						},
 					},
 				}},
@@ -256,19 +257,7 @@ func Test_MapRouteForService(t *testing.T) {
 	cl := fake.NewClientBuilder().
 		WithScheme(scheme).
 		WithObjects(svc, httpRoute).
-		WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, func(obj client.Object) []string {
-			httpRoute, ok := obj.(*gwtypes.HTTPRoute)
-			if !ok {
-				return nil
-			}
-			var keys []string
-			for _, rule := range httpRoute.Spec.Rules {
-				for _, ref := range rule.BackendRefs {
-					keys = append(keys, httpRoute.Namespace+"/"+string(ref.BackendRef.Name))
-				}
-			}
-			return keys
-		}).
+		WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, index.BackendServicesOnHTTPRoute).
 		Build()
 
 	mapFunc := MapRouteForService(cl, &gwtypes.HTTPRoute{})
@@ -293,19 +282,7 @@ func Test_MapRouteForService(t *testing.T) {
 		clDiffNS := fake.NewClientBuilder().
 			WithScheme(scheme).
 			WithObjects(otherSvc, httpRoute).
-			WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, func(obj client.Object) []string {
-				httpRoute, ok := obj.(*gwtypes.HTTPRoute)
-				if !ok {
-					return nil
-				}
-				var keys []string
-				for _, rule := range httpRoute.Spec.Rules {
-					for _, ref := range rule.BackendRefs {
-						keys = append(keys, httpRoute.Namespace+"/"+string(ref.BackendRef.Name))
-					}
-				}
-				return keys
-			}).
+			WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, index.BackendServicesOnHTTPRoute).
 			Build()
 		mapFuncDiffNS := MapRouteForService(clDiffNS, &gwtypes.HTTPRoute{})
 		ctx := context.Background()
@@ -356,6 +333,7 @@ func Test_MapRouteForEndpointSlice(t *testing.T) {
 					BackendRef: gwtypes.BackendRef{
 						BackendObjectReference: gwtypes.BackendObjectReference{
 							Name: gatewayv1.ObjectName("test-svc"),
+							Port: new(gatewayv1.PortNumber(80)),
 						},
 					},
 				}},
@@ -376,19 +354,7 @@ func Test_MapRouteForEndpointSlice(t *testing.T) {
 	cl := fake.NewClientBuilder().
 		WithScheme(scheme).
 		WithObjects(svc, httpRoute, epSlice).
-		WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, func(obj client.Object) []string {
-			httpRoute, ok := obj.(*gwtypes.HTTPRoute)
-			if !ok {
-				return nil
-			}
-			var keys []string
-			for _, rule := range httpRoute.Spec.Rules {
-				for _, ref := range rule.BackendRefs {
-					keys = append(keys, httpRoute.Namespace+"/"+string(ref.BackendRef.Name))
-				}
-			}
-			return keys
-		}).
+		WithIndex(&gwtypes.HTTPRoute{}, index.BackendServicesOnHTTPRouteIndex, index.BackendServicesOnHTTPRoute).
 		Build()
 
 	mapFunc := MapRouteForEndpointSlice(cl, &gwtypes.HTTPRoute{})

internal/utils/index/gateway_route_test.go

@@ -11,7 +11,7 @@ import (
 	gwtypes "github.com/kong/kong-operator/v2/internal/types"
 )
 
-func TestGatewaysOnRoute(t *testing.T) {
+func TestGatewaysOnRoute_HTTPRoute(t *testing.T) {
 	tests := []struct {
 		name string
 		obj  client.Object
@@ -109,7 +109,7 @@ func TestGatewaysOnRoute(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := GatewaysOnRoute(tt.obj)
+			got := GatewaysOnRoute[gwtypes.HTTPRoute](tt.obj)
 			require.ElementsMatch(t, tt.want, got)
 		})
 	}

internal/utils/index/httproute.go

@@ -28,7 +28,7 @@ func OptionsForHTTPRoute() []Option {
 		{
 			Object:         &gwtypes.HTTPRoute{},
 			Field:          BackendServicesOnHTTPRouteIndex,
-			ExtractValueFn: backendServicesOnHTTPRoute,
+			ExtractValueFn: BackendServicesOnHTTPRoute,
 		},
 		{
 			Object:         &gwtypes.HTTPRoute{},
@@ -43,9 +43,9 @@ func OptionsForHTTPRoute() []Option {
 	}
 }
 
-// backendServicesOnHTTPRoute extracts and returns a list of unique Service references (in "namespace/name" format)
+// BackendServicesOnHTTPRoute extracts and returns a list of unique Service references (in "namespace/name" format)
 // from the BackendRefs of the given HTTPRoute object.
-func backendServicesOnHTTPRoute(o client.Object) []string {
+func BackendServicesOnHTTPRoute(o client.Object) []string {
 	httpRoute, ok := o.(*gwtypes.HTTPRoute)
 	if !ok {
 		return nil

internal/utils/index/httproute_test.go

@@ -142,7 +142,7 @@ func TestBackendRefOnHTTPRoute(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := backendServicesOnHTTPRoute(tc.obj)
+			got := BackendServicesOnHTTPRoute(tc.obj)
 			require.ElementsMatch(t, tc.want, got)
 		})
 	}
@@ -167,7 +167,7 @@ func TestKongPluginsOnHTTPRoute(t *testing.T) {
 			want: nil,
 		},
 		{
-			name: "single filter with extenstionRef type",
+			name: "single filter with extensionRef type",
 			obj: &gwtypes.HTTPRoute{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "ns1"},
 				Spec: gwtypes.HTTPRouteSpec{
@@ -213,7 +213,7 @@ func TestKongPluginsOnHTTPRoute(t *testing.T) {
 			want: nil,
 		},
 		{
-			name: "multiple exensionRefs with duplicate names",
+			name: "multiple extensionRefs with duplicate names",
 			obj: &gwtypes.HTTPRoute{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "ns1"},
 				Spec: gwtypes.HTTPRouteSpec{