Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RateLimit.Conditions need explicit scope #1145

Merged
merged 1 commit into from
Jan 30, 2025
+25 −25
Merged

RateLimit.Conditions need explicit scope #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/limitador_limits_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
Namespace: limitsNamespace,
MaxValue: maxValue,
Seconds: seconds,
Conditions: []string{fmt.Sprintf("%s == \"1\"", limitIdentifier)},
Conditions: []string{fmt.Sprintf("descriptors[0][\"%s\"] == \"1\"", limitIdentifier)},

Check warning on line 127 in controllers/limitador_limits_reconciler.go

View check run for this annotation

Codecov / codecov/patch

controllers/limitador_limits_reconciler.go#L127 

Added line #L127 was not covered by tests
Copy link
Member

@adam-cattermole adam-cattermole Jan 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes I remember seeing this in the limitador PR I approved but didn't connect the dots here

Variables: utils.GetEmptySliceIfNil(limit.CountersAsStringList()),
}
})
Expand Down
20 changes: 10 additions & 10 deletions pkg/ratelimit/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,71 +140,71 @@ func TestIndexToRateLimits(t *testing.T) {

func TestEqualsTo(t *testing.T) {
global_l0 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l0",
Seconds: 10,
Variables: []string{},
}
global_l1 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l1",
Seconds: 10,
Variables: []string{},
}
global_l2 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l2",
Seconds: 10,
Variables: []string{},
}
global_l3 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l3",
Seconds: 10,
Variables: []string{},
}
global_l4 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l4",
Seconds: 10,
Variables: []string{},
}
global_l5 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l5",
Seconds: 10,
Variables: []string{},
}
global_l6 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._global___3f2bfd8b == \"1\""},
Conditions: []string{"descriptors[0][\"limit._global___3f2bfd8b\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l6",
Seconds: 10,
Variables: []string{},
}

httproute_l0 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._httproute_level__ac417cac == \"1\""},
Conditions: []string{"descriptors[0][\"limit._httproute_level__ac417cac\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l0",
Seconds: 10,
Variables: []string{},
}
httproute_l1 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._httproute_level__e4abd750 == \"1\""},
Conditions: []string{"descriptors[0][\"limit._httproute_level__e4abd750\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l1",
Seconds: 10,
Variables: []string{},
}
httproute_l5 := limitadorv1alpha1.RateLimit{
Conditions: []string{"limit._httproute_level__e1d71177 == \"1\""},
Conditions: []string{"descriptors[0][\"limit._httproute_level__e1d71177\"] == \"1\""},
MaxValue: 3,
Namespace: "default/test-3-gw0-l5",
Seconds: 10,
Expand Down
28 changes: 14 additions & 14 deletions tests/common/ratelimitpolicy/ratelimitpolicy_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 3 * 60,
Namespace: controllers.LimitsNamespaceFromRoute(httpRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(rlpKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(rlpKey, "l1"))},
Variables: []string{},
}))
}).WithContext(ctx).Should(Succeed())
Expand Down Expand Up @@ -339,7 +339,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 3 * 60,
Namespace: controllers.LimitsNamespaceFromRoute(httpRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(rlpKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(rlpKey, "l1"))},
Variables: []string{},
}))
}).WithContext(ctx).Should(Succeed())
Expand Down Expand Up @@ -421,7 +421,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 10,
Seconds: 5,
Namespace: controllers.LimitsNamespaceFromRoute(httpRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "l1"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())
})
Expand Down Expand Up @@ -520,7 +520,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 180,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())

Expand All @@ -532,7 +532,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 10,
Seconds: 5,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())
}, testTimeOut)
Expand All @@ -557,7 +557,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 180,
Namespace: controllers.LimitsNamespaceFromRoute(httpRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())
}, testTimeOut)
Expand Down Expand Up @@ -588,7 +588,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 10,
Seconds: 5,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())

Expand All @@ -610,7 +610,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 180,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())
}, testTimeOut)
Expand All @@ -637,7 +637,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1,
Seconds: 180,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(gwRLPKey, "l1"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())

Expand All @@ -659,7 +659,7 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 10,
Seconds: 5,
Namespace: limitsNamespace,
Conditions: []string{fmt.Sprintf(`%s == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, controllers.LimitNameToLimitadorIdentifier(routeRLPKey, "route"))},
Variables: []string{},
})).WithContext(ctx).Should(Succeed())
}, testTimeOut)
Expand Down Expand Up @@ -850,28 +850,28 @@ var _ = Describe("RateLimitPolicy controller", func() {
MaxValue: 1000,
Seconds: 1,
Namespace: controllers.LimitsNamespaceFromRoute(targetedRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, limitIdentifierGwA)},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, limitIdentifierGwA)},
Variables: []string{},
},
limitadorv1alpha1.RateLimit{
MaxValue: 100,
Seconds: 1,
Namespace: controllers.LimitsNamespaceFromRoute(targetedRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, limitIdentifierGwB)},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, limitIdentifierGwB)},
Variables: []string{},
},
limitadorv1alpha1.RateLimit{ // FIXME(@guicassolato): we need to create one limit definition per gateway × route combination, not one per gateway × policy combination
MaxValue: 1000,
Seconds: 1,
Namespace: controllers.LimitsNamespaceFromRoute(untargetedRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, limitIdentifierGwA)},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, limitIdentifierGwA)},
Variables: []string{},
},
limitadorv1alpha1.RateLimit{
MaxValue: 100,
Seconds: 1,
Namespace: controllers.LimitsNamespaceFromRoute(untargetedRoute),
Conditions: []string{fmt.Sprintf(`%s == "1"`, limitIdentifierGwB)},
Conditions: []string{fmt.Sprintf(`descriptors[0]["%s"] == "1"`, limitIdentifierGwB)},
Variables: []string{},
},
)).WithContext(ctx).Should(Succeed())
Expand Down
Loading