Skip to content

Optimize test helper to accept pointer parameter #2034

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

Open
RiteshGiram wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

Optimize test helper to accept pointer parameter #2034

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
14 changes: 7 additions & 7 deletions tests/common/ratelimitpolicy/ratelimitpolicy_grpcroute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ var _ = Describe("RateLimitPolicy controller (GRPCRoute)", func() {
}
limitsNamespace := limitsNamespaceForGRPCRoute(grpcRoute)
limitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(policy), "l1")
return limitadorLimitsContain(*limitador, limitsNamespace, limitKey)
return limitadorLimitsContain(limitador, limitsNamespace, limitKey)
}).WithContext(ctx).Should(BeTrue())
}, testTimeOut)

Expand Down Expand Up @@ -177,7 +177,7 @@ var _ = Describe("RateLimitPolicy controller (GRPCRoute)", func() {
}
limitsNamespace := limitsNamespaceForGRPCRoute(grpcRoute)
limitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(policy), "l1")
return limitadorLimitsContain(*limitador, limitsNamespace, limitKey)
return limitadorLimitsContain(limitador, limitsNamespace, limitKey)
}).WithContext(ctx).Should(BeTrue())
}, testTimeOut)

Expand Down Expand Up @@ -233,12 +233,12 @@ var _ = Describe("RateLimitPolicy controller (GRPCRoute)", func() {
// Route policy limit for grpcRoute
routeLimitsNamespace := limitsNamespaceForGRPCRoute(grpcRoute)
routeLimitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(routePolicy), "l1")
hasRouteLimit := limitadorLimitsContain(*limitador, routeLimitsNamespace, routeLimitKey)
hasRouteLimit := limitadorLimitsContain(limitador, routeLimitsNamespace, routeLimitKey)

// Gateway policy limit for policyless route
gwLimitsNamespace := limitsNamespaceForGRPCRoute(otherRoute)
gwLimitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(gwPolicy), "gw-limit")
hasGWLimit := limitadorLimitsContain(*limitador, gwLimitsNamespace, gwLimitKey)
hasGWLimit := limitadorLimitsContain(limitador, gwLimitsNamespace, gwLimitKey)

return hasRouteLimit && hasGWLimit
}).WithContext(ctx).Should(BeTrue())
Expand Down Expand Up @@ -266,7 +266,7 @@ var _ = Describe("RateLimitPolicy controller (GRPCRoute)", func() {
}
limitsNamespace := limitsNamespaceForGRPCRoute(grpcRoute)
limitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(policy), "l1")
return limitadorLimitsContain(*limitador, limitsNamespace, limitKey)
return limitadorLimitsContain(limitador, limitsNamespace, limitKey)
}).WithContext(ctx).Should(BeTrue())

// delete policy
Expand All @@ -281,15 +281,15 @@ var _ = Describe("RateLimitPolicy controller (GRPCRoute)", func() {
}
limitsNamespace := limitsNamespaceForGRPCRoute(grpcRoute)
limitKey := limitKeyForGRPCPath(client.ObjectKeyFromObject(policy), "l1")
return !limitadorLimitsContain(*limitador, limitsNamespace, limitKey)
return !limitadorLimitsContain(limitador, limitsNamespace, limitKey)
}).WithContext(ctx).Should(BeTrue())
}, testTimeOut)
})

})

// limitadorLimitsContain checks if limitador contains a limit with the given namespace and identifier
func limitadorLimitsContain(limitador limitadorv1alpha1.Limitador, namespace, identifier string) bool {
func limitadorLimitsContain(limitador *limitadorv1alpha1.Limitador, namespace, identifier string) bool {
expected := fmt.Sprintf(`descriptors[0]["%s"] == "1"`, identifier)
for _, limit := range limitador.Spec.Limits {
if limit.Namespace != namespace {
Expand Down