Move routeKeyForKind

Author: Kate Osborn

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

@@ -283,17 +283,3 @@ func markConflictedPolicies(policies map[PolicyKey]*Policy, validator validation
 		}
 	}
 }
-
-func routeKeyForKind(kind v1.Kind, nsname types.NamespacedName) RouteKey {
-	key := RouteKey{NamespacedName: nsname}
-	switch kind {
-	case kinds.HTTPRoute:
-		key.RouteType = RouteTypeHTTP
-	case kinds.GRPCRoute:
-		key.RouteType = RouteTypeGRPC
-	default:
-		panic(fmt.Sprintf("unsupported route kind: %s", kind))
-	}
-
-	return key
-}

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

@@ -805,24 +805,6 @@ func TestMarkConflictedPolicies(t *testing.T) {
 	}
 }
 
-func TestRouteKeyForKind(t *testing.T) {
-	nsname := types.NamespacedName{Namespace: testNs, Name: "route"}
-
-	g := NewWithT(t)
-
-	key := routeKeyForKind(kinds.HTTPRoute, nsname)
-	g.Expect(key).To(Equal(RouteKey{RouteType: RouteTypeHTTP, NamespacedName: nsname}))
-
-	key = routeKeyForKind(kinds.GRPCRoute, nsname)
-	g.Expect(key).To(Equal(RouteKey{RouteType: RouteTypeGRPC, NamespacedName: nsname}))
-
-	rk := func() {
-		_ = routeKeyForKind(kinds.Gateway, nsname)
-	}
-
-	g.Expect(rk).To(Panic())
-}
-
 func createPolicyWithAncestors(numAncestors int) policies.Policy {
 	policy := &policiesfakes.FakePolicy{}
 

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

@@ -576,3 +576,17 @@ func validateHeaderMatch(
 
 	return allErrs
 }
+
+func routeKeyForKind(kind v1.Kind, nsname types.NamespacedName) RouteKey {
+	key := RouteKey{NamespacedName: nsname}
+	switch kind {
+	case kinds.HTTPRoute:
+		key.RouteType = RouteTypeHTTP
+	case kinds.GRPCRoute:
+		key.RouteType = RouteTypeGRPC
+	default:
+		panic(fmt.Sprintf("unsupported route kind: %s", kind))
+	}
+
+	return key
+}

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

@@ -1243,3 +1243,21 @@ func TestValidateHostnames(t *testing.T) {
 		})
 	}
 }
+
+func TestRouteKeyForKind(t *testing.T) {
+	nsname := types.NamespacedName{Namespace: testNs, Name: "route"}
+
+	g := NewWithT(t)
+
+	key := routeKeyForKind(kinds.HTTPRoute, nsname)
+	g.Expect(key).To(Equal(RouteKey{RouteType: RouteTypeHTTP, NamespacedName: nsname}))
+
+	key = routeKeyForKind(kinds.GRPCRoute, nsname)
+	g.Expect(key).To(Equal(RouteKey{RouteType: RouteTypeGRPC, NamespacedName: nsname}))
+
+	rk := func() {
+		_ = routeKeyForKind(kinds.Gateway, nsname)
+	}
+
+	g.Expect(rk).To(Panic())
+}