refactor route filter config

Signed-off-by: huabing zhao <[email protected]>

internal/xds/translator/httpfilters.go

@@ -8,6 +8,7 @@ package translator
 import (
 	"sort"
 
+	routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	hcmv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 
@@ -75,7 +76,9 @@ func sortHTTPFilters(filters []*hcmv3.HttpFilter) []*hcmv3.HttpFilter {
 
 // patchHCMWithFilters builds and appends HTTP Filters to the HTTP connection
 // manager.
-func (t *Translator) patchHCMWithFilters(mgr *hcmv3.HttpConnectionManager, irListener *ir.HTTPListener) error {
+func (t *Translator) patchHCMWithFilters(
+	mgr *hcmv3.HttpConnectionManager,
+	irListener *ir.HTTPListener) error {
 	// The order of filter patching is not relevant here.
 	// All the filters will be sorted in correct order after the patching is done.
 	// TODO: Make this a generic interface for all API Gateway features.
@@ -99,3 +102,26 @@ func (t *Translator) patchHCMWithFilters(mgr *hcmv3.HttpConnectionManager, irLis
 	mgr.HttpFilters = sortHTTPFilters(mgr.HttpFilters)
 	return nil
 }
+
+// patchRouteWithFilters appends per-route filter configurations to the route.
+func patchRouteWithFilters(
+	route *routev3.Route,
+	irRoute *ir.HTTPRoute) error {
+	// TODO: Convert this into a generic interface for API Gateway features.
+	//       https://github.com/envoyproxy/gateway/issues/882
+	if err :=
+		patchRouteWithRateLimit(route.GetRoute(), irRoute); err != nil {
+		return nil
+	}
+
+	// Add the jwt per route config to the route, if needed.
+	if err := patchRouteWithJwtConfig(route, irRoute); err != nil {
+		return nil
+	}
+
+	// Add the cors per route config to the route, if needed.
+	if err := patchRouteWithCorsConfig(route, irRoute); err != nil {
+		return err
+	}
+	return nil
+}

internal/xds/translator/route.go

@@ -71,19 +71,8 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute) *routev3.Route {
 		router.GetRoute().Timeout = durationpb.New(httpRoute.Timeout.Duration)
 	}
 
-	// TODO: Convert this into a generic interface for API Gateway features.
-	//       https://github.com/envoyproxy/gateway/issues/882
-	if err := patchRouteWithRateLimit(router.GetRoute(), httpRoute); err != nil {
-		return nil
-	}
-
-	// Add the jwt per route config to the route, if needed.
-	if err := patchRouteWithJwtConfig(router, httpRoute); err != nil {
-		return nil
-	}
-
-	// Add the cors per route config to the route, if needed.
-	if err := patchRouteWithCorsConfig(router, httpRoute); err != nil {
+	// Add per route filter configs to the route, if needed.
+	if err := patchRouteWithFilters(router, httpRoute); err != nil {
 		return nil
 	}