diff --git a/controllers/ratelimitpolicy_status_test.go b/controllers/ratelimitpolicy_status_test.go index effc0c93b..d1ebe7ea9 100644 --- a/controllers/ratelimitpolicy_status_test.go +++ b/controllers/ratelimitpolicy_status_test.go @@ -10,25 +10,25 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2" + kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3" "github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant" ) func TestRateLimitPolicyReconciler_calculateStatus(t *testing.T) { type args struct { - rlp *kuadrantv1beta2.RateLimitPolicy + rlp *kuadrantv1beta3.RateLimitPolicy specErr error } tests := []struct { name string args args - want *kuadrantv1beta2.RateLimitPolicyStatus + want *kuadrantv1beta3.RateLimitPolicyStatus }{ { name: "Enforced status block removed if policy not Accepted. (Regression test)", // https://github.com/Kuadrant/kuadrant-operator/issues/588 args: args{ - rlp: &kuadrantv1beta2.RateLimitPolicy{ - Status: kuadrantv1beta2.RateLimitPolicyStatus{ + rlp: &kuadrantv1beta3.RateLimitPolicy{ + Status: kuadrantv1beta3.RateLimitPolicyStatus{ Conditions: []metav1.Condition{ { Message: "not accepted", @@ -47,7 +47,7 @@ func TestRateLimitPolicyReconciler_calculateStatus(t *testing.T) { }, specErr: kuadrant.NewErrInvalid("RateLimitPolicy", errors.New("policy Error")), }, - want: &kuadrantv1beta2.RateLimitPolicyStatus{ + want: &kuadrantv1beta3.RateLimitPolicyStatus{ Conditions: []metav1.Condition{ { Message: "RateLimitPolicy target is invalid: policy Error", diff --git a/pkg/library/mappers/gateway_test.go b/pkg/library/mappers/gateway_test.go index 7017e549b..6de310348 100644 --- a/pkg/library/mappers/gateway_test.go +++ b/pkg/library/mappers/gateway_test.go @@ -16,7 +16,7 @@ import ( gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2" + kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3" "github.com/kuadrant/kuadrant-operator/pkg/library/fieldindexers" kuadrantgatewayapi "github.com/kuadrant/kuadrant-operator/pkg/library/gatewayapi" "github.com/kuadrant/kuadrant-operator/pkg/library/utils" @@ -36,7 +36,7 @@ func TestNewGatewayEventMapper(t *testing.T) { t.Fatal(err) } - err = kuadrantv1beta2.AddToScheme(testScheme) + err = kuadrantv1beta3.AddToScheme(testScheme) if err != nil { t.Fatal(err) } @@ -63,7 +63,7 @@ func TestNewGatewayEventMapper(t *testing.T) { t.Run("not gateway related event", func(subT *testing.T) { objs := []runtime.Object{} cl := clientBuilder(objs) - em := NewGatewayEventMapper(kuadrantv1beta2.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) + em := NewGatewayEventMapper(kuadrantv1beta3.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) requests := em.Map(ctx, &gatewayapiv1.HTTPRoute{}) assert.DeepEqual(subT, []reconcile.Request{}, requests) }) @@ -71,7 +71,7 @@ func TestNewGatewayEventMapper(t *testing.T) { t.Run("gateway related event - no policies - no requests", func(subT *testing.T) { objs := []runtime.Object{} cl := clientBuilder(objs) - em := NewGatewayEventMapper(kuadrantv1beta2.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) + em := NewGatewayEventMapper(kuadrantv1beta3.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) requests := em.Map(ctx, &gatewayapiv1.Gateway{}) assert.DeepEqual(subT, []reconcile.Request{}, requests) }) @@ -91,7 +91,7 @@ func TestNewGatewayEventMapper(t *testing.T) { }) objs := []runtime.Object{gw, route, pGw, pRoute} cl := clientBuilder(objs) - em := NewGatewayEventMapper(kuadrantv1beta2.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) + em := NewGatewayEventMapper(kuadrantv1beta3.NewRateLimitPolicyType(), WithClient(cl), WithLogger(log.NewLogger())) requests := em.Map(ctx, gw) assert.Equal(subT, len(requests), 2) assert.Assert(subT, utils.Index(requests, func(r reconcile.Request) bool { diff --git a/pkg/library/mappers/utils_test.go b/pkg/library/mappers/utils_test.go index eedf7a204..a7fbb0b11 100644 --- a/pkg/library/mappers/utils_test.go +++ b/pkg/library/mappers/utils_test.go @@ -7,7 +7,7 @@ import ( gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2" + kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3" ) func gatewayFactory(ns, name string) *gatewayapiv1.Gateway { @@ -30,10 +30,10 @@ func routeFactory(ns, name string, parentRef gatewayapiv1.ParentReference) *gate } } -func policyFactory(ns, name string, targetRef gatewayapiv1alpha2.LocalPolicyTargetReference) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ - TypeMeta: metav1.TypeMeta{Kind: "RateLimitPolicy", APIVersion: kuadrantv1beta2.GroupVersion.String()}, +func policyFactory(ns, name string, targetRef gatewayapiv1alpha2.LocalPolicyTargetReference) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ + TypeMeta: metav1.TypeMeta{Kind: "RateLimitPolicy", APIVersion: kuadrantv1beta3.GroupVersion.String()}, ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns}, - Spec: kuadrantv1beta2.RateLimitPolicySpec{TargetRef: targetRef}, + Spec: kuadrantv1beta3.RateLimitPolicySpec{TargetRef: targetRef}, } } diff --git a/pkg/rlptools/utils_test.go b/pkg/rlptools/utils_test.go index 3bb10fbbb..8d414847a 100644 --- a/pkg/rlptools/utils_test.go +++ b/pkg/rlptools/utils_test.go @@ -6,28 +6,29 @@ import ( "reflect" "testing" - limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2" + limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1" + + kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3" "github.com/kuadrant/kuadrant-operator/pkg/library/utils" ) -func testRLP_1Limit_1Rate(ns, name string) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ +func testRLP_1Limit_1Rate(ns, name string) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ TypeMeta: metav1.TypeMeta{ Kind: "RateLimitPolicy", - APIVersion: kuadrantv1beta2.GroupVersion.String(), + APIVersion: kuadrantv1beta3.GroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: ns, }, - Spec: kuadrantv1beta2.RateLimitPolicySpec{ - RateLimitPolicyCommonSpec: kuadrantv1beta2.RateLimitPolicyCommonSpec{ - Limits: map[string]kuadrantv1beta2.Limit{ + Spec: kuadrantv1beta3.RateLimitPolicySpec{ + RateLimitPolicyCommonSpec: kuadrantv1beta3.RateLimitPolicyCommonSpec{ + Limits: map[string]kuadrantv1beta3.Limit{ "l1": { - Rates: []kuadrantv1beta2.Rate{ + Rates: []kuadrantv1beta3.Rate{ { Limit: 5, Duration: 10, @@ -41,21 +42,21 @@ func testRLP_1Limit_1Rate(ns, name string) *kuadrantv1beta2.RateLimitPolicy { } } -func testRLP_2Limits_1Rate(ns, name string) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ +func testRLP_2Limits_1Rate(ns, name string) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ TypeMeta: metav1.TypeMeta{ Kind: "RateLimitPolicy", - APIVersion: kuadrantv1beta2.GroupVersion.String(), + APIVersion: kuadrantv1beta3.GroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: ns, }, - Spec: kuadrantv1beta2.RateLimitPolicySpec{ - RateLimitPolicyCommonSpec: kuadrantv1beta2.RateLimitPolicyCommonSpec{ - Limits: map[string]kuadrantv1beta2.Limit{ + Spec: kuadrantv1beta3.RateLimitPolicySpec{ + RateLimitPolicyCommonSpec: kuadrantv1beta3.RateLimitPolicyCommonSpec{ + Limits: map[string]kuadrantv1beta3.Limit{ "l1": { - Rates: []kuadrantv1beta2.Rate{ + Rates: []kuadrantv1beta3.Rate{ { Limit: 5, Duration: 10, @@ -64,7 +65,7 @@ func testRLP_2Limits_1Rate(ns, name string) *kuadrantv1beta2.RateLimitPolicy { }, }, "l2": { - Rates: []kuadrantv1beta2.Rate{ + Rates: []kuadrantv1beta3.Rate{ { Limit: 3, Duration: 1, @@ -78,21 +79,21 @@ func testRLP_2Limits_1Rate(ns, name string) *kuadrantv1beta2.RateLimitPolicy { } } -func testRLP_1Limit_2Rates(ns, name string) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ +func testRLP_1Limit_2Rates(ns, name string) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ TypeMeta: metav1.TypeMeta{ Kind: "RateLimitPolicy", - APIVersion: kuadrantv1beta2.GroupVersion.String(), + APIVersion: kuadrantv1beta3.GroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: ns, }, - Spec: kuadrantv1beta2.RateLimitPolicySpec{ - RateLimitPolicyCommonSpec: kuadrantv1beta2.RateLimitPolicyCommonSpec{ - Limits: map[string]kuadrantv1beta2.Limit{ + Spec: kuadrantv1beta3.RateLimitPolicySpec{ + RateLimitPolicyCommonSpec: kuadrantv1beta3.RateLimitPolicyCommonSpec{ + Limits: map[string]kuadrantv1beta3.Limit{ "l1": { - Rates: []kuadrantv1beta2.Rate{ + Rates: []kuadrantv1beta3.Rate{ { Limit: 5, Duration: 10, @@ -111,24 +112,24 @@ func testRLP_1Limit_2Rates(ns, name string) *kuadrantv1beta2.RateLimitPolicy { } } -func testRLP_1Limit_1Rate_1Counter(ns, name string) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ +func testRLP_1Limit_1Rate_1Counter(ns, name string) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ TypeMeta: metav1.TypeMeta{ Kind: "RateLimitPolicy", - APIVersion: kuadrantv1beta2.GroupVersion.String(), + APIVersion: kuadrantv1beta3.GroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: ns, }, - Spec: kuadrantv1beta2.RateLimitPolicySpec{ - RateLimitPolicyCommonSpec: kuadrantv1beta2.RateLimitPolicyCommonSpec{ - Limits: map[string]kuadrantv1beta2.Limit{ + Spec: kuadrantv1beta3.RateLimitPolicySpec{ + RateLimitPolicyCommonSpec: kuadrantv1beta3.RateLimitPolicyCommonSpec{ + Limits: map[string]kuadrantv1beta3.Limit{ "l1": { - Counters: []kuadrantv1beta2.ContextSelector{ + Counters: []kuadrantv1beta3.ContextSelector{ "request.path", }, - Rates: []kuadrantv1beta2.Rate{ + Rates: []kuadrantv1beta3.Rate{ { Limit: 5, Duration: 10, @@ -145,7 +146,7 @@ func testRLP_1Limit_1Rate_1Counter(ns, name string) *kuadrantv1beta2.RateLimitPo func TestLimitadorRateLimitsFromRLP(t *testing.T) { testCases := []struct { name string - rlp *kuadrantv1beta2.RateLimitPolicy + rlp *kuadrantv1beta3.RateLimitPolicy expected []limitadorv1alpha1.RateLimit }{ { @@ -244,78 +245,78 @@ func TestLimitadorRateLimitsFromRLP(t *testing.T) { func TestConvertRateIntoSeconds(t *testing.T) { testCases := []struct { name string - rate kuadrantv1beta2.Rate + rate kuadrantv1beta3.Rate expectedMaxValue int expectedSeconds int }{ { name: "seconds", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("second"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("second"), }, expectedMaxValue: 5, expectedSeconds: 2, }, { name: "minutes", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("minute"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("minute"), }, expectedMaxValue: 5, expectedSeconds: 2 * 60, }, { name: "hours", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("hour"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("hour"), }, expectedMaxValue: 5, expectedSeconds: 2 * 60 * 60, }, { name: "day", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("day"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("day"), }, expectedMaxValue: 5, expectedSeconds: 2 * 60 * 60 * 24, }, { name: "negative limit", - rate: kuadrantv1beta2.Rate{ - Limit: -5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("second"), + rate: kuadrantv1beta3.Rate{ + Limit: -5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("second"), }, expectedMaxValue: 0, expectedSeconds: 2, }, { name: "negative duration", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: -2, Unit: kuadrantv1beta2.TimeUnit("second"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: -2, Unit: kuadrantv1beta3.TimeUnit("second"), }, expectedMaxValue: 5, expectedSeconds: 0, }, { name: "limit is 0", - rate: kuadrantv1beta2.Rate{ - Limit: 0, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("second"), + rate: kuadrantv1beta3.Rate{ + Limit: 0, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("second"), }, expectedMaxValue: 0, expectedSeconds: 2, }, { name: "rate is 0", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 0, Unit: kuadrantv1beta2.TimeUnit("second"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 0, Unit: kuadrantv1beta3.TimeUnit("second"), }, expectedMaxValue: 5, expectedSeconds: 0, }, { name: "unexpected time unit", - rate: kuadrantv1beta2.Rate{ - Limit: 5, Duration: 2, Unit: kuadrantv1beta2.TimeUnit("unknown"), + rate: kuadrantv1beta3.Rate{ + Limit: 5, Duration: 2, Unit: kuadrantv1beta3.TimeUnit("unknown"), }, expectedMaxValue: 5, expectedSeconds: 0, diff --git a/pkg/rlptools/wasm/utils_test.go b/pkg/rlptools/wasm/utils_test.go index cffb26bfc..35f990288 100644 --- a/pkg/rlptools/wasm/utils_test.go +++ b/pkg/rlptools/wasm/utils_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/utils/ptr" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - kuadrantv1beta2 "github.com/kuadrant/kuadrant-operator/api/v1beta2" + kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3" ) // TODO(eastizle): missing WASMPluginMutator tests @@ -46,14 +46,14 @@ func TestRules(t *testing.T) { }, } - rlp := func(name string, limits map[string]kuadrantv1beta2.Limit) *kuadrantv1beta2.RateLimitPolicy { - return &kuadrantv1beta2.RateLimitPolicy{ + rlp := func(name string, limits map[string]kuadrantv1beta3.Limit) *kuadrantv1beta3.RateLimitPolicy { + return &kuadrantv1beta3.RateLimitPolicy{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: "my-app", }, - Spec: kuadrantv1beta2.RateLimitPolicySpec{ - RateLimitPolicyCommonSpec: kuadrantv1beta2.RateLimitPolicyCommonSpec{ + Spec: kuadrantv1beta3.RateLimitPolicySpec{ + RateLimitPolicyCommonSpec: kuadrantv1beta3.RateLimitPolicyCommonSpec{ Limits: limits, }, }, @@ -61,23 +61,23 @@ func TestRules(t *testing.T) { } // a simple 50rps counter, for convinience, to be used in tests - counter50rps := kuadrantv1beta2.Rate{ + counter50rps := kuadrantv1beta3.Rate{ Limit: 50, Duration: 1, - Unit: kuadrantv1beta2.TimeUnit("second"), + Unit: kuadrantv1beta3.TimeUnit("second"), } testCases := []struct { name string - rlp *kuadrantv1beta2.RateLimitPolicy + rlp *kuadrantv1beta3.RateLimitPolicy route *gatewayapiv1.HTTPRoute expectedRules []Rule }{ { name: "minimal RLP", - rlp: rlp("minimal", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("minimal", map[string]kuadrantv1beta3.Limit{ "50rps": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, + Rates: []kuadrantv1beta3.Rate{counter50rps}, }, }), route: httpRoute, @@ -88,12 +88,12 @@ func TestRules(t *testing.T) { AllOf: []PatternExpression{ { Selector: "request.url_path", - Operator: PatternOperator(kuadrantv1beta2.StartsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.StartsWithOperator), Value: "/toy", }, { Selector: "request.method", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "GET", }, }, @@ -112,10 +112,10 @@ func TestRules(t *testing.T) { }, { name: "RLP with route selector based on hostname", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps-for-selected-hostnames": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, - RouteSelectors: []kuadrantv1beta2.RouteSelector{ + Rates: []kuadrantv1beta3.Rate{counter50rps}, + RouteSelectors: []kuadrantv1beta3.RouteSelector{ { Hostnames: []gatewayapiv1.Hostname{ "*.example.com", @@ -133,17 +133,17 @@ func TestRules(t *testing.T) { AllOf: []PatternExpression{ { Selector: "request.url_path", - Operator: PatternOperator(kuadrantv1beta2.StartsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.StartsWithOperator), Value: "/toy", }, { Selector: "request.method", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "GET", }, { Selector: "request.host", - Operator: PatternOperator(kuadrantv1beta2.EndsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.EndsWithOperator), Value: ".example.com", }, }, @@ -162,10 +162,10 @@ func TestRules(t *testing.T) { }, { name: "RLP with route selector based on http route matches (full match)", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps-for-selected-route": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, - RouteSelectors: []kuadrantv1beta2.RouteSelector{ + Rates: []kuadrantv1beta3.Rate{counter50rps}, + RouteSelectors: []kuadrantv1beta3.RouteSelector{ { Matches: []gatewayapiv1.HTTPRouteMatch{ { @@ -188,12 +188,12 @@ func TestRules(t *testing.T) { AllOf: []PatternExpression{ { Selector: "request.url_path", - Operator: PatternOperator(kuadrantv1beta2.StartsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.StartsWithOperator), Value: "/toy", }, { Selector: "request.method", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "GET", }, }, @@ -212,10 +212,10 @@ func TestRules(t *testing.T) { }, { name: "RLP with route selector based on http route matches (partial match)", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps-for-selected-path": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, - RouteSelectors: []kuadrantv1beta2.RouteSelector{ + Rates: []kuadrantv1beta3.Rate{counter50rps}, + RouteSelectors: []kuadrantv1beta3.RouteSelector{ { Matches: []gatewayapiv1.HTTPRouteMatch{ { @@ -237,12 +237,12 @@ func TestRules(t *testing.T) { AllOf: []PatternExpression{ { Selector: "request.url_path", - Operator: PatternOperator(kuadrantv1beta2.StartsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.StartsWithOperator), Value: "/toy", }, { Selector: "request.method", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "GET", }, }, @@ -261,10 +261,10 @@ func TestRules(t *testing.T) { }, { name: "RLP with mismatching route selectors", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps-for-non-existent-route": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, - RouteSelectors: []kuadrantv1beta2.RouteSelector{ + Rates: []kuadrantv1beta3.Rate{counter50rps}, + RouteSelectors: []kuadrantv1beta3.RouteSelector{ { Matches: []gatewayapiv1.HTTPRouteMatch{ { @@ -280,9 +280,9 @@ func TestRules(t *testing.T) { }, { name: "HTTPRouteRules without rule matches", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, + Rates: []kuadrantv1beta3.Rate{counter50rps}, }, }), route: catchAllHTTPRoute, @@ -302,10 +302,10 @@ func TestRules(t *testing.T) { }, { name: "RLP with counter qualifier", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps-per-username": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, - Counters: []kuadrantv1beta2.ContextSelector{"auth.identity.username"}, + Rates: []kuadrantv1beta3.Rate{counter50rps}, + Counters: []kuadrantv1beta3.ContextSelector{"auth.identity.username"}, }, }), route: catchAllHTTPRoute, @@ -330,9 +330,9 @@ func TestRules(t *testing.T) { }, { name: "Route with header match", - rlp: rlp("my-rlp", map[string]kuadrantv1beta2.Limit{ + rlp: rlp("my-rlp", map[string]kuadrantv1beta3.Limit{ "50rps": { - Rates: []kuadrantv1beta2.Rate{counter50rps}, + Rates: []kuadrantv1beta3.Rate{counter50rps}, }, }), route: &gatewayapiv1.HTTPRoute{ @@ -370,22 +370,22 @@ func TestRules(t *testing.T) { AllOf: []PatternExpression{ { Selector: "request.url_path", - Operator: PatternOperator(kuadrantv1beta2.StartsWithOperator), + Operator: PatternOperator(kuadrantv1beta3.StartsWithOperator), Value: "/v1", }, { Selector: "request.method", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "GET", }, { Selector: "request.headers.X-kuadrant-a", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "1", }, { Selector: "request.headers.X-kuadrant-b", - Operator: PatternOperator(kuadrantv1beta2.EqualOperator), + Operator: PatternOperator(kuadrantv1beta3.EqualOperator), Value: "1", }, },