DirectResponse

zirain · zirain · commit 115fdb1f3692 · 2024-05-14T05:10:37.000+08:00
Signed-off-by: zirain &lt;zirain2009@gmail.com&gt;
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -516,7 +516,8 @@ func (t *Translator) processGRPCRouteRules(grpcRoute *GRPCRouteContext, parentRe
 
 		// If the route has no valid backends then just use a direct response and don't fuss with weighted responses
 		for _, ruleRoute := range ruleRoutes {
-			if ruleRoute.Destination == nil && ruleRoute.Redirect == nil {
+			noValidBackends := ruleRoute.Destination == nil || ruleRoute.Destination.ToBackendWeights().Valid == 0
+			if noValidBackends && ruleRoute.Redirect == nil {
 				ruleRoute.DirectResponse = &ir.DirectResponse{
 					StatusCode: 500,
 				}
diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml
@@ -576,6 +576,8 @@ xdsIR:
           name: grpcroute/envoy-gateway/grpcroute-1/rule/0
           settings:
           - weight: 1
+        directResponse:
+          statusCode: 500
         headerMatches:
         - distinct: false
           exact: foo
diff --git a/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/envoyextensionpolicy-status-conditions.out.yaml
@@ -575,6 +575,8 @@ xdsIR:
           name: grpcroute/envoy-gateway/grpcroute-1/rule/0
           settings:
           - weight: 1
+        directResponse:
+          statusCode: 500
         headerMatches:
         - distinct: false
           exact: foo
diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml
@@ -447,6 +447,8 @@ xdsIR:
           name: grpcroute/envoy-gateway/grpcroute-1/rule/0
           settings:
           - weight: 1
+        directResponse:
+          statusCode: 500
         headerMatches:
         - distinct: false
           exact: foo

Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,8 @@ func (t Translator) processGRPCRouteRules(grpcRoute GRPCRouteContext, parentRe`
`516`	`516`
`517`	`517`	`// If the route has no valid backends then just use a direct response and don't fuss with weighted responses`
`518`	`518`	`for _, ruleRoute := range ruleRoutes {`
`519`		`- if ruleRoute.Destination == nil && ruleRoute.Redirect == nil {`
	`519`	`+ noValidBackends := ruleRoute.Destination == nil \|\| ruleRoute.Destination.ToBackendWeights().Valid == 0`
	`520`	`+ if noValidBackends && ruleRoute.Redirect == nil {`
`520`	`521`	`ruleRoute.DirectResponse = &ir.DirectResponse{`
`521`	`522`	`StatusCode: 500,`
`522`	`523`	`}`