Fix route/path naming for conflicts

Author: sjberman

internal/mode/static/state/dataplane/convert_test.go

@@ -351,7 +351,7 @@ func TestConvertHTTPMirrorFilter(t *testing.T) {
 			expected: &HTTPRequestMirrorFilter{
 				Name:      helpers.GetPointer("backend"),
 				Namespace: helpers.GetPointer("namespace"),
-				Target:    helpers.GetPointer("/_ngf-internal-mirror-namespace-backend-0"),
+				Target:    helpers.GetPointer("/_ngf-internal-mirror-namespace/backend-0"),
 			},
 			name: "full",
 		},

internal/mode/static/state/graph/common_filter_test.go

@@ -103,7 +103,7 @@ func TestValidateFilter(t *testing.T) {
 				RequestMirror: &gatewayv1.HTTPRequestMirrorFilter{},
 			},
 			expectErrCount: 0,
-			name:           "valid GRPC filter",
+			name:           "valid GRPC mirror filter",
 		},
 		{
 			filter: Filter{

internal/mode/static/state/graph/grpcroute.go

@@ -91,7 +91,11 @@ func buildGRPCMirrorRoutes(
 
 				objectMeta := route.ObjectMeta.DeepCopy()
 				backendRef := filter.RequestMirror.BackendRef
-				name := mirror.RouteName(route.GetName(), string(backendRef.Name), (*string)(backendRef.Namespace), idx)
+				namespace := route.GetNamespace()
+				if backendRef.Namespace != nil {
+					namespace = string(*backendRef.Namespace)
+				}
+				name := mirror.RouteName(route.GetName(), string(backendRef.Name), namespace, idx)
 				objectMeta.SetName(name)
 
 				tmpMirrorRoute := &v1.GRPCRoute{

internal/mode/static/state/graph/grpcroute_test.go

@@ -1140,7 +1140,7 @@ func TestBuildGRPCRouteWithMirrorRoutes(t *testing.T) {
 		Source: &v1.GRPCRoute{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace: "test",
-				Name:      mirror.RouteName("gr", "mirror-backend", nil, 0),
+				Name:      mirror.RouteName("gr", "mirror-backend", "test", 0),
 			},
 			Spec: v1.GRPCRouteSpec{
 				CommonRouteSpec: gr.Spec.CommonRouteSpec,

internal/mode/static/state/graph/httproute.go

@@ -87,7 +87,11 @@ func buildHTTPMirrorRoutes(
 
 				objectMeta := route.ObjectMeta.DeepCopy()
 				backendRef := filter.RequestMirror.BackendRef
-				name := mirror.RouteName(route.GetName(), string(backendRef.Name), (*string)(backendRef.Namespace), idx)
+				namespace := route.GetNamespace()
+				if backendRef.Namespace != nil {
+					namespace = string(*backendRef.Namespace)
+				}
+				name := mirror.RouteName(route.GetName(), string(backendRef.Name), namespace, idx)
 				objectMeta.SetName(name)
 
 				tmpMirrorRoute := &v1.HTTPRoute{

internal/mode/static/state/graph/httproute_test.go

@@ -942,7 +942,7 @@ func TestBuildHTTPRouteWithMirrorRoutes(t *testing.T) {
 		Source: &gatewayv1.HTTPRoute{
 			ObjectMeta: metav1.ObjectMeta{
 				Namespace: "test",
-				Name:      mirror.RouteName("hr", "mirror-backend", nil, 0),
+				Name:      mirror.RouteName("hr", "mirror-backend", "test", 0),
 			},
 			Spec: gatewayv1.HTTPRouteSpec{
 				CommonRouteSpec: hr.Spec.CommonRouteSpec,

internal/mode/static/state/mirror/mirror.go

@@ -12,13 +12,9 @@ import (
 // RouteName builds the name for the internal mirror route, using the user route name,
 // service namespace/name, and index of the rule.
 // The prefix is used to prevent a user from creating a route with a conflicting name.
-func RouteName(routeName, service string, namespace *string, idx int) string {
+func RouteName(routeName, service, namespace string, idx int) string {
 	prefix := strings.TrimPrefix(http.InternalMirrorRoutePathPrefix, "/")
-	if namespace != nil {
-		return fmt.Sprintf("%s-%s-%s-%s-%d", prefix, routeName, service, *namespace, idx)
-	}
-
-	return fmt.Sprintf("%s-%s-%s-%d", prefix, routeName, service, idx)
+	return fmt.Sprintf("%s-%s-%s/%s-%d", prefix, routeName, namespace, service, idx)
 }
 
 // BackendPath builds the path for the internal mirror location, using the BackendRef.
@@ -35,7 +31,7 @@ func BackendPath(idx int, namespace *string, service string) *string {
 	var mirrorPath string
 
 	if namespace != nil {
-		mirrorPath = fmt.Sprintf("%s-%s-%s-%d", http.InternalMirrorRoutePathPrefix, *namespace, service, idx)
+		mirrorPath = fmt.Sprintf("%s-%s/%s-%d", http.InternalMirrorRoutePathPrefix, *namespace, service, idx)
 	} else {
 		mirrorPath = fmt.Sprintf("%s-%s-%d", http.InternalMirrorRoutePathPrefix, service, idx)
 	}

internal/mode/static/state/mirror/mirror_test.go

@@ -11,42 +11,10 @@ import (
 
 func TestRouteName(t *testing.T) {
 	t.Parallel()
+	g := NewWithT(t)
 
-	tests := []struct {
-		namespace *string
-		name      string
-		routeName string
-		service   string
-		expected  string
-		idx       int
-	}{
-		{
-			name:      "with namespace",
-			routeName: "route1",
-			service:   "service1",
-			namespace: helpers.GetPointer("namespace1"),
-			idx:       1,
-			expected:  "_ngf-internal-mirror-route1-service1-namespace1-1",
-		},
-		{
-			name:      "without namespace",
-			routeName: "route2",
-			service:   "service2",
-			namespace: nil,
-			idx:       2,
-			expected:  "_ngf-internal-mirror-route2-service2-2",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			g := NewWithT(t)
-
-			result := RouteName(tt.routeName, tt.service, tt.namespace, tt.idx)
-			g.Expect(result).To(Equal(tt.expected))
-		})
-	}
+	result := RouteName("route1", "service1", "namespace1", 1)
+	g.Expect(result).To(Equal("_ngf-internal-mirror-route1-namespace1/service1-1"))
 }
 
 func TestPathWithBackendRef(t *testing.T) {
@@ -65,7 +33,7 @@ func TestPathWithBackendRef(t *testing.T) {
 				Name:      "service1",
 				Namespace: helpers.GetPointer[v1.Namespace]("namespace1"),
 			},
-			expected: helpers.GetPointer("/_ngf-internal-mirror-namespace1-service1-1"),
+			expected: helpers.GetPointer("/_ngf-internal-mirror-namespace1/service1-1"),
 		},
 		{
 			name: "without namespace",
@@ -103,7 +71,7 @@ func TestBackendPath(t *testing.T) {
 			idx:       1,
 			namespace: helpers.GetPointer("namespace1"),
 			service:   "service1",
-			expected:  helpers.GetPointer("/_ngf-internal-mirror-namespace1-service1-1"),
+			expected:  helpers.GetPointer("/_ngf-internal-mirror-namespace1/service1-1"),
 		},
 		{
 			name:      "Without namespace",