initial code change

draft coding

Signed-off-by: Ronnie Personal <[email protected]>

internal/gatewayapi/filters.go

@@ -29,7 +29,7 @@ type HTTPFiltersTranslator interface {
 	processRedirectFilter(redirect *v1beta1.HTTPRequestRedirectFilter, filterContext *HTTPFiltersContext)
 	processRequestHeaderModifierFilter(headerModifier *v1beta1.HTTPHeaderFilter, filterContext *HTTPFiltersContext)
 	processResponseHeaderModifierFilter(headerModifier *v1beta1.HTTPHeaderFilter, filterContext *HTTPFiltersContext)
-	processRequestMirrorFilter(mirror *v1beta1.HTTPRequestMirrorFilter, filterContext *HTTPFiltersContext, resources *Resources)
+	processRequestMirrorFilter(filterIdx int, mirror *v1beta1.HTTPRequestMirrorFilter, filterContext *HTTPFiltersContext, resources *Resources)
 	processExtensionRefHTTPFilter(extRef *v1beta1.LocalObjectReference, filterContext *HTTPFiltersContext, resources *Resources)
 	processUnsupportedHTTPFilter(filterType string, filterContext *HTTPFiltersContext)
 }
@@ -56,7 +56,7 @@ type HTTPFilterIR struct {
 	AddResponseHeaders    []ir.AddHeader
 	RemoveResponseHeaders []string
 
-	Mirror *ir.RouteDestination
+	Mirror []*ir.RouteDestination
 
 	RequestAuthentication *ir.RequestAuthentication
 	RateLimit             *ir.RateLimit
@@ -76,7 +76,7 @@ func (t *Translator) ProcessHTTPFilters(parentRef *RouteParentContext,
 		RuleIdx:      ruleIdx,
 		HTTPFilterIR: &HTTPFilterIR{},
 	}
-
+	filterIdx := 0
 	for i := range filters {
 		filter := filters[i]
 		// If an invalid filter type has been configured then skip processing any more filters
@@ -98,7 +98,8 @@ func (t *Translator) ProcessHTTPFilters(parentRef *RouteParentContext,
 		case v1beta1.HTTPRouteFilterResponseHeaderModifier:
 			t.processResponseHeaderModifierFilter(filter.ResponseHeaderModifier, httpFiltersContext)
 		case v1beta1.HTTPRouteFilterRequestMirror:
-			t.processRequestMirrorFilter(filter.RequestMirror, httpFiltersContext, resources)
+			t.processRequestMirrorFilter(filterIdx, filter.RequestMirror, httpFiltersContext, resources)
+			filterIdx++
 		case v1beta1.HTTPRouteFilterExtensionRef:
 			t.processExtensionRefHTTPFilter(filter.ExtensionRef, httpFiltersContext, resources)
 		default:
@@ -120,7 +121,7 @@ func (t *Translator) ProcessGRPCFilters(parentRef *RouteParentContext,
 
 		HTTPFilterIR: &HTTPFilterIR{},
 	}
-
+	filterIdx := 0
 	for i := range filters {
 		filter := filters[i]
 		// If an invalid filter type has been configured then skip processing any more filters
@@ -138,7 +139,8 @@ func (t *Translator) ProcessGRPCFilters(parentRef *RouteParentContext,
 		case v1alpha2.GRPCRouteFilterResponseHeaderModifier:
 			t.processResponseHeaderModifierFilter(filter.ResponseHeaderModifier, httpFiltersContext)
 		case v1alpha2.GRPCRouteFilterRequestMirror:
-			t.processRequestMirrorFilter(filter.RequestMirror, httpFiltersContext, resources)
+			t.processRequestMirrorFilter(filterIdx, filter.RequestMirror, httpFiltersContext, resources)
+			filterIdx++
 		case v1alpha2.GRPCRouteFilterExtensionRef:
 			t.processExtensionRefHTTPFilter(filter.ExtensionRef, httpFiltersContext, resources)
 		default:
@@ -808,6 +810,7 @@ func (t *Translator) processExtensionRefHTTPFilter(extFilter *v1beta1.LocalObjec
 }
 
 func (t *Translator) processRequestMirrorFilter(
+	filterIdx int,
 	mirrorFilter *v1beta1.HTTPRequestMirrorFilter,
 	filterContext *HTTPFiltersContext,
 	resources *Resources) {
@@ -839,22 +842,26 @@ func (t *Translator) processRequestMirrorFilter(
 	// Only add missing mirror destinations
 	for _, mirrorEp := range mirrorEndpoints {
 		var found bool
-		if filterContext.Mirror != nil {
-			for _, mirror := range filterContext.Mirror.Endpoints {
+		if filterContext.Mirror != nil && filterIdx < len(filterContext.Mirror) {
+			for _, mirror := range filterContext.Mirror[filterIdx].Endpoints {
 				if mirror != nil {
 					if mirror.Host == mirrorEp.Host && mirror.Port == mirrorEp.Port {
 						found = true
 					}
 				}
 			}
 		}
+
 		if !found {
-			if filterContext.Mirror == nil {
-				filterContext.Mirror = &ir.RouteDestination{
-					Name: fmt.Sprintf("%s-mirror", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx)),
+			if filterContext.Mirror == nil || filterIdx >= len(filterContext.Mirror) {
+				newMirror := &ir.RouteDestination{
+					Name: fmt.Sprintf("%s-mirror-%d", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx), filterIdx),
 				}
+				newMirror.Endpoints = append(newMirror.Endpoints, mirrorEp)
+				filterContext.Mirror = append(filterContext.Mirror, newMirror)
+			} else {
+				filterContext.Mirror[filterIdx].Endpoints = append(filterContext.Mirror[filterIdx].Endpoints, mirrorEp)
 			}
-			filterContext.Mirror.Endpoints = append(filterContext.Mirror.Endpoints, mirrorEp)
 		}
 	}
 }

internal/ir/xds.go

@@ -261,7 +261,7 @@ type HTTPRoute struct {
 	// Redirections to be returned for this route. Takes precedence over Destinations.
 	Redirect *Redirect `json:"redirect,omitempty" yaml:"redirect,omitempty"`
 	// Destination that requests to this HTTPRoute will be mirrored to
-	Mirror *RouteDestination `json:"mirror,omitempty" yaml:"mirror,omitempty"`
+	Mirror []*RouteDestination `json:"mirror,omitempty" yaml:"mirror,omitempty"`
 	// Destination associated with this matched route.
 	Destination *RouteDestination `json:"destination,omitempty" yaml:"destination,omitempty"`
 	// Rewrite to be changed for this route.
@@ -352,8 +352,10 @@ func (h HTTPRoute) Validate() error {
 		}
 	}
 	if h.Mirror != nil {
-		if err := h.Mirror.Validate(); err != nil {
-			errs = multierror.Append(errs, err)
+		for _, mirror := range h.Mirror {
+			if err := mirror.Validate(); err != nil {
+				errs = multierror.Append(errs, err)
+			}
 		}
 	}
 	if len(h.AddRequestHeaders) > 0 {

internal/xds/translator/route.go

@@ -45,7 +45,7 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute, listener *listenerv3.Listener) *rout
 	case httpRoute.URLRewrite != nil:
 		routeAction := buildXdsURLRewriteAction(httpRoute.Destination.Name, httpRoute.URLRewrite)
 		if httpRoute.Mirror != nil {
-			routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror.Name)
+			routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror)
 		}
 
 		router.Action = &routev3.Route_Route{Route: routeAction}
@@ -54,13 +54,13 @@ func buildXdsRoute(httpRoute *ir.HTTPRoute, listener *listenerv3.Listener) *rout
 			// If there are invalid backends then a weighted cluster is required for the route
 			routeAction := buildXdsWeightedRouteAction(httpRoute)
 			if httpRoute.Mirror != nil {
-				routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror.Name)
+				routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror)
 			}
 			router.Action = &routev3.Route_Route{Route: routeAction}
 		} else {
 			routeAction := buildXdsRouteAction(httpRoute.Destination.Name)
 			if httpRoute.Mirror != nil {
-				routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror.Name)
+				routeAction.RequestMirrorPolicies = buildXdsRequestMirrorPolicies(httpRoute.Mirror)
 			}
 			router.Action = &routev3.Route_Route{Route: routeAction}
 		}
@@ -293,11 +293,13 @@ func buildXdsDirectResponseAction(res *ir.DirectResponse) *routev3.DirectRespons
 	return routeAction
 }
 
-func buildXdsRequestMirrorPolicies(destName string) []*routev3.RouteAction_RequestMirrorPolicy {
-	mirrorPolicies := []*routev3.RouteAction_RequestMirrorPolicy{
-		{
-			Cluster: destName,
-		},
+func buildXdsRequestMirrorPolicies(mirrorDestinations []*ir.RouteDestination) []*routev3.RouteAction_RequestMirrorPolicy {
+	var mirrorPolicies []*routev3.RouteAction_RequestMirrorPolicy
+
+	for _, mirrorDest := range mirrorDestinations {
+		mirrorPolicies = append(mirrorPolicies, &routev3.RouteAction_RequestMirrorPolicy{
+			Cluster: mirrorDest.Name,
+		})
 	}
 
 	return mirrorPolicies

internal/xds/translator/translator.go

@@ -197,14 +197,16 @@ func (t *Translator) processHTTPListenerXdsTranslation(tCtx *types.ResourceVersi
 			}
 
 			if httpRoute.Mirror != nil {
-				if err := addXdsCluster(tCtx, addXdsClusterArgs{
-					name:         httpRoute.Mirror.Name,
-					endpoints:    httpRoute.Mirror.Endpoints,
-					tSocket:      nil,
-					protocol:     protocol,
-					endpointType: Static,
-				}); err != nil && !errors.Is(err, ErrXdsClusterExists) {
-					return err
+				for _, mirrorDest := range httpRoute.Mirror {
+					if err := addXdsCluster(tCtx, addXdsClusterArgs{
+						name:         mirrorDest.Name,
+						endpoints:    mirrorDest.Endpoints,
+						tSocket:      nil,
+						protocol:     protocol,
+						endpointType: Static,
+					}); err != nil && !errors.Is(err, ErrXdsClusterExists) {
+						return err
+					}
 				}
 			}
 		}