Add status in HTTPRoute when Ratelimit is disabled (#982)

arkodg · web-flow · commit ebb902bb2c60 · 2023-02-04T13:17:07.000-08:00
* Add status in HTTPRoute when Ratelimit is disabled

Signed-off-by: Arko Dasgupta &lt;arko@tetrate.io&gt;
diff --git a/internal/gatewayapi/filters.go b/internal/gatewayapi/filters.go
@@ -684,6 +684,12 @@ func (t *Translator) processExtensionRefHTTPFilter(extFilter *v1beta1.LocalObjec
 					t.processUnresolvedHTTPFilter(errMsg, filterContext)
 					return
 				}
+				if !t.GlobalRateLimitEnabled {
+					errMsg := fmt.Sprintf("Enable Ratelimit in the EnvoyGateway config to configure RateLimitFilter: %s/%s",
+						filterNs, extFilter.Name)
+					t.processUnresolvedHTTPFilter(errMsg, filterContext)
+					return
+				}
 				rateLimit := &ir.RateLimit{
 					Global: &ir.GlobalRateLimit{
 						Rules: make([]*ir.RateLimitRule, len(rateLimitFilter.Spec.Global.Rules)),
diff --git a/internal/gatewayapi/runner/runner.go b/internal/gatewayapi/runner/runner.go
@@ -55,7 +55,8 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {
 
 			// Translate and publish IRs.
 			t := &gatewayapi.Translator{
-				GatewayClassName: v1beta1.ObjectName(update.Key),
+				GatewayClassName:       v1beta1.ObjectName(update.Key),
+				GlobalRateLimitEnabled: r.EnvoyGateway.RateLimit != nil,
 			}
 			// Translate to IR
 			result := t.Translate(val)
diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
@@ -57,6 +57,10 @@ type Translator struct {
 	// the Infra IR. If unspecified, the default proxy
 	// image will be used.
 	ProxyImage string
+
+	// GlobalRateLimitEnabled is true when global
+	// ratelimiting has been configured by the admin.
+	GlobalRateLimitEnabled bool
 }
 
 type TranslateResult struct {
diff --git a/internal/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go
@@ -47,8 +47,9 @@ func TestTranslate(t *testing.T) {
 			mustUnmarshal(t, string(output), want)
 
 			translator := &Translator{
-				GatewayClassName: "envoy-gateway-class",
-				ProxyImage:       "envoyproxy/envoy:translator-tests",
+				GatewayClassName:       "envoy-gateway-class",
+				ProxyImage:             "envoyproxy/envoy:translator-tests",
+				GlobalRateLimitEnabled: true,
 			}
 
 			// Add common test fixtures

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {`
`55`	`55`
`56`	`56`	`// Translate and publish IRs.`
`57`	`57`	`t := &gatewayapi.Translator{`
`58`		`- GatewayClassName: v1beta1.ObjectName(update.Key),`
	`58`	`+ GatewayClassName: v1beta1.ObjectName(update.Key),`
	`59`	`+ GlobalRateLimitEnabled: r.EnvoyGateway.RateLimit != nil,`
`59`	`60`	`}`
`60`	`61`	`// Translate to IR`
`61`	`62`	`result := t.Translate(val)`