squash, implement retry/timeout in consul core

.changelog/18324.txt

@@ -0,0 +1,3 @@
+```release-note:feature
+api-gateway: add retry and timeout filters
+```

agent/consul/discoverychain/gateway_httproute.go

@@ -161,6 +161,28 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 			}
 		}
 
+		if rule.Filters.RetryFilter != nil {
+			if rule.Filters.RetryFilter.NumRetries != nil {
+				destination.NumRetries = *rule.Filters.RetryFilter.NumRetries
+			}
+			if rule.Filters.RetryFilter.RetryOnConnectFailure != nil {
+				destination.RetryOnConnectFailure = *rule.Filters.RetryFilter.RetryOnConnectFailure
+			}
+
+			if len(rule.Filters.RetryFilter.RetryOn) > 0 {
+				destination.RetryOn = rule.Filters.RetryFilter.RetryOn
+			}
+
+			if len(rule.Filters.RetryFilter.RetryOnStatusCodes) > 0 {
+				destination.RetryOnStatusCodes = rule.Filters.RetryFilter.RetryOnStatusCodes
+			}
+		}
+
+		if rule.Filters.TimeoutFilter != nil {
+			destination.IdleTimeout = rule.Filters.TimeoutFilter.IdleTimeout
+			destination.RequestTimeout = rule.Filters.TimeoutFilter.RequestTimeout
+		}
+
 		// for each match rule a ServiceRoute is created for the service-router
 		// if there are no rules a single route with the destination is set
 		if len(rule.Matches) == 0 {
@@ -173,6 +195,7 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 				Destination: &destination,
 			})
 		}
+
 	}
 
 	return router, splitters, defaults

agent/structs/config_entry_routes.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/miekg/dns"
 
@@ -417,8 +418,10 @@ type HTTPQueryMatch struct {
 // HTTPFilters specifies a list of filters used to modify a request
 // before it is routed to an upstream.
 type HTTPFilters struct {
-	Headers    []HTTPHeaderFilter
-	URLRewrite *URLRewrite
+	Headers       []HTTPHeaderFilter
+	URLRewrite    *URLRewrite
+	RetryFilter   *RetryFilter
+	TimeoutFilter *TimeoutFilter
 }
 
 // HTTPHeaderFilter specifies how HTTP headers should be modified.
@@ -432,6 +435,18 @@ type URLRewrite struct {
 	Path string
 }
 
+type RetryFilter struct {
+	NumRetries            *uint32
+	RetryOn               []string
+	RetryOnStatusCodes    []uint32
+	RetryOnConnectFailure *bool
+}
+
+type TimeoutFilter struct {
+	RequestTimeout time.Duration
+	IdleTimeout    time.Duration
+}
+
 // HTTPRouteRule specifies the routing rules used to determine what upstream
 // service an HTTP request is routed to.
 type HTTPRouteRule struct {

agent/structs/structs.deepcopy.go

@@ -383,6 +383,30 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry {
 				cp.Rules[i2].Filters.URLRewrite = new(URLRewrite)
 				*cp.Rules[i2].Filters.URLRewrite = *o.Rules[i2].Filters.URLRewrite
 			}
+			if o.Rules[i2].Filters.RetryFilter != nil {
+				cp.Rules[i2].Filters.RetryFilter = new(RetryFilter)
+				*cp.Rules[i2].Filters.RetryFilter = *o.Rules[i2].Filters.RetryFilter
+				if o.Rules[i2].Filters.RetryFilter.NumRetries != nil {
+					cp.Rules[i2].Filters.RetryFilter.NumRetries = new(uint32)
+					*cp.Rules[i2].Filters.RetryFilter.NumRetries = *o.Rules[i2].Filters.RetryFilter.NumRetries
+				}
+				if o.Rules[i2].Filters.RetryFilter.RetryOn != nil {
+					cp.Rules[i2].Filters.RetryFilter.RetryOn = make([]string, len(o.Rules[i2].Filters.RetryFilter.RetryOn))
+					copy(cp.Rules[i2].Filters.RetryFilter.RetryOn, o.Rules[i2].Filters.RetryFilter.RetryOn)
+				}
+				if o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes != nil {
+					cp.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes = make([]uint32, len(o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes))
+					copy(cp.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes, o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes)
+				}
+				if o.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure != nil {
+					cp.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure = new(bool)
+					*cp.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure = *o.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure
+				}
+			}
+			if o.Rules[i2].Filters.TimeoutFilter != nil {
+				cp.Rules[i2].Filters.TimeoutFilter = new(TimeoutFilter)
+				*cp.Rules[i2].Filters.TimeoutFilter = *o.Rules[i2].Filters.TimeoutFilter
+			}
 			if o.Rules[i2].Matches != nil {
 				cp.Rules[i2].Matches = make([]HTTPMatch, len(o.Rules[i2].Matches))
 				copy(cp.Rules[i2].Matches, o.Rules[i2].Matches)
@@ -427,6 +451,30 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry {
 						cp.Rules[i2].Services[i4].Filters.URLRewrite = new(URLRewrite)
 						*cp.Rules[i2].Services[i4].Filters.URLRewrite = *o.Rules[i2].Services[i4].Filters.URLRewrite
 					}
+					if o.Rules[i2].Services[i4].Filters.RetryFilter != nil {
+						cp.Rules[i2].Services[i4].Filters.RetryFilter = new(RetryFilter)
+						*cp.Rules[i2].Services[i4].Filters.RetryFilter = *o.Rules[i2].Services[i4].Filters.RetryFilter
+						if o.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries != nil {
+							cp.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries = new(uint32)
+							*cp.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries = *o.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries
+						}
+						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn != nil {
+							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn = make([]string, len(o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn))
+							copy(cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn, o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn)
+						}
+						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes != nil {
+							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes = make([]uint32, len(o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes))
+							copy(cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes, o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes)
+						}
+						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure != nil {
+							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure = new(bool)
+							*cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure = *o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure
+						}
+					}
+					if o.Rules[i2].Services[i4].Filters.TimeoutFilter != nil {
+						cp.Rules[i2].Services[i4].Filters.TimeoutFilter = new(TimeoutFilter)
+						*cp.Rules[i2].Services[i4].Filters.TimeoutFilter = *o.Rules[i2].Services[i4].Filters.TimeoutFilter
+					}
 				}
 			}
 		}

agent/xds/resources_test.go

@@ -7,12 +7,14 @@ import (
 	"path/filepath"
 	"sort"
 	"testing"
+	"time"
 
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	"k8s.io/utils/pointer"
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
@@ -565,6 +567,15 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 										Remove: []string{"X-Header-Remove"},
 									},
 								},
+								RetryFilter: &structs.RetryFilter{
+									NumRetries:            pointer.Uint32(3),
+									RetryOnStatusCodes:    []uint32{500},
+									RetryOnConnectFailure: pointer.Bool(true),
+								},
+								TimeoutFilter: &structs.TimeoutFilter{
+									IdleTimeout:    time.Second * 30,
+									RequestTimeout: time.Second * 30,
+								},
 							},
 							Services: []structs.HTTPService{{
 								Name: "service",

agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden

@@ -17,7 +17,16 @@
                 "prefix":  "/"
               },
               "route":  {
-                "cluster":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "cluster":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "30s",
+                "idleTimeout":  "30s",
+                "retryPolicy":  {
+                  "retryOn":  "connect-failure,retriable-status-codes",
+                  "numRetries":  3,
+                  "retriableStatusCodes":  [
+                    500
+                  ]
+                }
               },
               "requestHeadersToAdd":  [
                 {

api/config_entry_routes.go

@@ -3,6 +3,8 @@
 
 package api
 
+import "time"
+
 // TCPRouteConfigEntry -- TODO stub
 type TCPRouteConfigEntry struct {
 	// Kind of the config entry. This should be set to api.TCPRoute.
@@ -195,8 +197,10 @@ type HTTPQueryMatch struct {
 // HTTPFilters specifies a list of filters used to modify a request
 // before it is routed to an upstream.
 type HTTPFilters struct {
-	Headers    []HTTPHeaderFilter
-	URLRewrite *URLRewrite
+	Headers       []HTTPHeaderFilter
+	URLRewrite    *URLRewrite
+	RetryFilter   *RetryFilter
+	TimeoutFilter *TimeoutFilter
 }
 
 // HTTPHeaderFilter specifies how HTTP headers should be modified.
@@ -210,6 +214,18 @@ type URLRewrite struct {
 	Path string
 }
 
+type RetryFilter struct {
+	NumRetries            *uint32
+	RetryOn               []string
+	RetryOnStatusCodes    []uint32
+	RetryOnConnectFailure *bool
+}
+
+type TimeoutFilter struct {
+	RequestTimeout time.Duration
+	IdleTimeout    time.Duration
+}
+
 // HTTPRouteRule specifies the routing rules used to determine what upstream
 // service an HTTP request is routed to.
 type HTTPRouteRule struct {

go.mod

@@ -118,6 +118,7 @@ require (
 	k8s.io/api v0.26.2
 	k8s.io/apimachinery v0.26.2
 	k8s.io/client-go v0.26.2
+	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
 )
 
 require (
@@ -257,7 +258,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.90.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect