fix test

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
envoyproxy · Jan 21, 2023 · 33a480c · 33a480c
1 parent 8af47cd
commit 33a480c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/internal/gatewayapi/filters.go b/internal/gatewayapi/filters.go
@@ -650,12 +650,12 @@ func (t *Translator) processExtensionRefHTTPFilter(filter v1beta1.HTTPRouteFilte
 					t.processUnresolvedHTTPFilter(errMsg, filterContext)
 					return
 				}
-				filterContext.HTTPFilterChains.RateLimit = &ir.RateLimit{
+				rateLimit := &ir.RateLimit{
 					Global: &ir.GlobalRateLimit{
 						Rules: make([]*ir.RateLimitRule, len(rateLimitFilter.Spec.Global.Rules)),
 					},
 				}
-				rules := filterContext.HTTPFilterChains.RateLimit.Global.Rules
+				rules := rateLimit.Global.Rules
 				for i, rule := range rateLimitFilter.Spec.Global.Rules {
 					rules[i] = &ir.RateLimitRule{
 						Limit: &ir.RateLimitValue{
@@ -698,6 +698,7 @@ func (t *Translator) processExtensionRefHTTPFilter(filter v1beta1.HTTPRouteFilte
 					}
 
 				}
+				filterContext.HTTPFilterChains.RateLimit = rateLimit
 				return
 			}
 		}

diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -226,6 +226,10 @@ func (t *Translator) processHTTPRouteRule(httpRoute *HTTPRouteContext, ruleIdx i
 		if httpFiltersContext.RequestAuthentication != nil {
 			irRoute.RequestAuthentication = httpFiltersContext.RequestAuthentication
 		}
+		if httpFiltersContext.RateLimit != nil {
+			irRoute.RateLimit = httpFiltersContext.RateLimit
+		}
+
 		ruleRoutes = append(ruleRoutes, irRoute)
 	}
 
@@ -280,6 +284,7 @@ func (t *Translator) processHTTPRouteParentRefListener(httpRoute *HTTPRouteConte
 					URLRewrite:            routeRoute.URLRewrite,
 					Mirrors:               routeRoute.Mirrors,
 					RequestAuthentication: routeRoute.RequestAuthentication,
+					RateLimit:             routeRoute.RateLimit,
 				}
 				// Don't bother copying over the weights unless the route has invalid backends.
 				if routeRoute.BackendWeights.Invalid > 0 {

diff --git a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml
@@ -79,6 +79,15 @@ xdsIR:
         headerMatches:
         - name: ":authority"
           exact: gateway.envoyproxy.io
+        rateLimit:
+          global:
+            rules:
+            - headerMatches:
+              - name: "x-user-id"
+                exact: "one"
+              limit:
+                requests: 10
+                unit: Hour
         destinations:
         - host: 7.7.7.7
           port: 8080