route selectors moved back to v1beta2

Signed-off-by: Guilherme Cassolato <[email protected]>

api/v1beta2/route_selectors.go

@@ -1,11 +1,73 @@
 package v1beta2
 
 import (
-	kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3"
+	"github.com/elliotchance/orderedmap/v2"
+	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
-// +kubebuilder:object:generate=false
-type RouteSelector = kuadrantv1beta3.RouteSelector
+// RouteSelector defines semantics for matching an HTTP request based on conditions
+// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
+type RouteSelector struct {
+	// Hostnames defines a set of hostname that should match against the HTTP Host header to select a HTTPRoute to process the request
+	// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
+	// +optional
+	Hostnames []gatewayapiv1.Hostname `json:"hostnames,omitempty"`
+
+	// Matches define conditions used for matching the rule against incoming HTTP requests.
+	// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
+	// +optional
+	// +kubebuilder:validation:MaxItems=8
+	Matches []gatewayapiv1.HTTPRouteMatch `json:"matches,omitempty"`
+}
+
+// SelectRules returns, from a HTTPRoute, all HTTPRouteRules that either specify no HTTRouteMatches or that contain at
+// least one HTTRouteMatch whose statements expressly include (partially or totally) the statements of at least one of
+// the matches of the selector. If the selector does not specify any matches, then all HTTPRouteRules are selected.
+//
+// Additionally, if the selector specifies a non-empty list of hostnames, a non-empty intersection between the literal
+// hostnames of the selector and set of hostnames specified in the HTTPRoute must exist. Otherwise, the function
+// returns nil.
+func (s *RouteSelector) SelectRules(route *gatewayapiv1.HTTPRoute) (rules []gatewayapiv1.HTTPRouteRule) {
+	rulesIndices := orderedmap.NewOrderedMap[int, gatewayapiv1.HTTPRouteRule]()
+	if len(s.Hostnames) > 0 && !utils.Intersect(s.Hostnames, route.Spec.Hostnames) {
+		return nil
+	}
+	if len(s.Matches) == 0 {
+		return route.Spec.Rules
+	}
+	for idx := range s.Matches {
+		routeSelectorMatch := s.Matches[idx]
+		for idx, rule := range route.Spec.Rules {
+			rs := kuadrant.HTTPRouteRuleSelector{HTTPRouteMatch: &routeSelectorMatch}
+			if rs.Selects(rule) {
+				rulesIndices.Set(idx, rule)
+			}
+		}
+	}
+	for el := rulesIndices.Front(); el != nil; el = el.Next() {
+		rules = append(rules, el.Value)
+	}
+	return
+}
+
+// HostnamesForConditions allows avoiding building conditions for hostnames that are excluded by the selector
+// or when the hostname is irrelevant (i.e. matches all hostnames)
+func (s *RouteSelector) HostnamesForConditions(route *gatewayapiv1.HTTPRoute) []gatewayapiv1.Hostname {
+	hostnames := route.Spec.Hostnames
+
+	if len(s.Hostnames) > 0 {
+		hostnames = utils.Intersection(s.Hostnames, hostnames)
+	}
+
+	if utils.SameElements(hostnames, route.Spec.Hostnames) {
+		return []gatewayapiv1.Hostname{"*"}
+	}
+
+	return hostnames
+}
 
 // +kubebuilder:object:generate=false
 type RouteSelectorsGetter interface {

api/v1beta3/route_selectors_test.go → api/v1beta2/route_selectors_test.go

@@ -1,6 +1,6 @@
 //go:build unit
 
-package v1beta3
+package v1beta2
 
 import (
 	"fmt"

pkg/rlptools/wasm/utils.go

@@ -18,6 +18,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2"
 	kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
 	kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi"
@@ -117,7 +118,7 @@ func conditionsFromLimit(limit *kuadrantv1beta3.Limit, route *gatewayapiv1.HTTPR
 	routeConditions := make([]Condition, 0)
 
 	// build conditions from all rules if no route selectors are defined
-	hostnamesForConditions := (&kuadrantv1beta3.RouteSelector{}).HostnamesForConditions(route)
+	hostnamesForConditions := (&kuadrantv1beta2.RouteSelector{}).HostnamesForConditions(route)
 	for _, rule := range route.Spec.Rules {
 		routeConditions = append(routeConditions, conditionsFromRule(rule, hostnamesForConditions)...)
 	}