Skip to content

Commit 9c984e1

Browse files
Aias00claude
andcommitted
fix: resolve CI lint and gen-check failures for RateLimitRule name
The CEL validation test used ptr.To from k8s.io/utils/ptr, which is forbidden by forbidigo (use new() builtin or a typed helper instead). Replace the 7 ptr.To(...) call sites with a small file-local ptrString helper that matches the existing SectionNamePtr/ObjectNamePtr convention, and drop the now-unused ptr import. The new ratelimit-rule-names testdata YAML was missing a trailing newline, which fails yamllint's new-line-at-end-of-file rule (part of make lint / gen-check). Add the trailing newline. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent fa9461b commit 9c984e1

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-rule-names.in.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ backendTrafficPolicies:
6767
value: 192.168.0.0/16
6868
limit:
6969
requests: 50
70-
unit: Hour
70+
unit: Hour

test/cel-validation/backendtrafficpolicy_test.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ import (
1717
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1818
"k8s.io/apimachinery/pkg/api/resource"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
20-
ptr "k8s.io/utils/ptr"
2120
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
2221
gwapiv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
2322

2423
egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
2524
)
2625

26+
// ptrString returns a pointer to the given string. Used in place of the
27+
// forbidden k8s.io/utils/ptr.To for *string literal values in test cases.
28+
func ptrString(s string) *string {
29+
v := s
30+
return &v
31+
}
32+
2733
func TestBackendTrafficPolicyTarget(t *testing.T) {
2834
ctx := context.Background()
2935
baseBTP := egv1a1.BackendTrafficPolicy{
@@ -3744,7 +3750,7 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
37443750
Global: &egv1a1.GlobalRateLimit{
37453751
Rules: []egv1a1.RateLimitRule{
37463752
{
3747-
Name: ptr.To("by-ip"),
3753+
Name: ptrString("by-ip"),
37483754
Limit: egv1a1.RateLimitValue{
37493755
Requests: 10,
37503756
Unit: "Minute",
@@ -3774,14 +3780,14 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
37743780
Global: &egv1a1.GlobalRateLimit{
37753781
Rules: []egv1a1.RateLimitRule{
37763782
{
3777-
Name: ptr.To("dup"),
3783+
Name: ptrString("dup"),
37783784
Limit: egv1a1.RateLimitValue{
37793785
Requests: 10,
37803786
Unit: "Minute",
37813787
},
37823788
},
37833789
{
3784-
Name: ptr.To("dup"),
3790+
Name: ptrString("dup"),
37853791
Limit: egv1a1.RateLimitValue{
37863792
Requests: 20,
37873793
Unit: "Minute",
@@ -3813,14 +3819,14 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
38133819
Local: &egv1a1.LocalRateLimit{
38143820
Rules: []egv1a1.RateLimitRule{
38153821
{
3816-
Name: ptr.To("dup"),
3822+
Name: ptrString("dup"),
38173823
Limit: egv1a1.RateLimitValue{
38183824
Requests: 10,
38193825
Unit: "Minute",
38203826
},
38213827
},
38223828
{
3823-
Name: ptr.To("dup"),
3829+
Name: ptrString("dup"),
38243830
Limit: egv1a1.RateLimitValue{
38253831
Requests: 20,
38263832
Unit: "Minute",
@@ -3852,7 +3858,7 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
38523858
Global: &egv1a1.GlobalRateLimit{
38533859
Rules: []egv1a1.RateLimitRule{
38543860
{
3855-
Name: ptr.To("0"),
3861+
Name: ptrString("0"),
38563862
Limit: egv1a1.RateLimitValue{
38573863
Requests: 10,
38583864
Unit: "Minute",
@@ -3884,7 +3890,7 @@ func TestBackendTrafficPolicyTarget(t *testing.T) {
38843890
Global: &egv1a1.GlobalRateLimit{
38853891
Rules: []egv1a1.RateLimitRule{
38863892
{
3887-
Name: ptr.To("a/b"),
3893+
Name: ptrString("a/b"),
38883894
Limit: egv1a1.RateLimitValue{
38893895
Requests: 10,
38903896
Unit: "Minute",

0 commit comments

Comments
 (0)