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

[Choreo] Changes to consider organization with subscription policies #3504

Merged
merged 18 commits into from
May 8, 2024
Merged

[Choreo] Changes to consider organization with subscription policies #3504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
883ba48
Changes to consider organization with subesription policies
slahirucd7 Apr 25, 2024
f551989
minor improvement
slahirucd7 Apr 25, 2024
bd3db88
minor improvement
slahirucd7 Apr 25, 2024
44bbe72
improvement to cache maintainance
slahirucd7 Apr 26, 2024
4ba9169
changes for review suggestions
slahirucd7 Apr 29, 2024
98af29b
mock backend docker file change
slahirucd7 Apr 29, 2024
9145b8e
fix for test case failure
slahirucd7 Apr 29, 2024
e09a480
changes for test case failures
slahirucd7 Apr 29, 2024
32ee6b6
Changes to address the review suggestions
slahirucd7 May 6, 2024
e5ebf4f
Changes to address the review suggestions
slahirucd7 May 6, 2024
0aed352
Changes to address the review suggestions
slahirucd7 May 6, 2024
14be15c
Changes for review suggestions
slahirucd7 May 7, 2024
ac427d0
minor change as per the request of renuka
slahirucd7 May 7, 2024
b71c480
support for env variable based organization consideration for subscri…
slahirucd7 May 8, 2024
95542b6
Changes to address the review suggestions
slahirucd7 May 8, 2024
f31aaf9
changes to update base image version and dependency versions
slahirucd7 May 8, 2024
9b70421
file content update
slahirucd7 May 8, 2024
3a5f40d
Update main.yml
slahirucd7 May 8, 2024
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
37 changes: 17 additions & 20 deletions adapter/internal/discovery/xds/rate_limiter_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,22 +250,22 @@ func (r *rateLimitPolicyCache) generateRateLimitConfig(label string) *rls_config
}

//Iterate through the subscription policies and append it to the orgDescriptors
// domain: Default
// descriptors:
// - key: organisation
// value: org001
// - key: subscription
// descriptors:
// - key: policy
// value: gold
// rate_limit:
// requests_per_unit: 1000
// unit: minute
// - key: policy
// value: silver
// rate_limit:
// requests_per_unit: 200
// unit: minute
// domain: Default
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// domain: Default
// Sample Rate Limiter config:
// domain: Default

// descriptors:
// - key: organisation
// value: org001
// - key: subscription
// descriptors:
// - key: policy
// value: gold
// rate_limit:
// requests_per_unit: 1000
// unit: minute
// - key: policy
// value: silver
// rate_limit:
// requests_per_unit: 200
// unit: minute
if subscriptionPoliciesList, ok := r.metadataBasedPolicies[subscriptionPolicyType]; ok {
for orgUUID := range subscriptionPoliciesList {
var metadataDescriptor *rls_config.RateLimitDescriptor
Expand Down Expand Up @@ -331,10 +331,7 @@ func AddSubscriptionLevelRateLimitPolicy(policyList *types.SubscriptionPolicyLis
}

// Need not to add the Unauthenticated and Unlimited policies to the rate limiter service
if policy.Organization == "carbon.super" && policy.Name == "Unauthenticated" {
continue
}
if policy.Name == "Unlimited" {
if (policy.Organization == "carbon.super" && policy.Name == "Unauthenticated") || policy.DefaultLimit.RequestCount.RequestCount == -1 {
continue
}
rateLimitUnit, err := parseRateLimitUnitFromSubscriptionPolicy(policy.DefaultLimit.RequestCount.TimeUnit)
Expand Down
4 changes: 2 additions & 2 deletions adapter/internal/discovery/xds/rate_limiter_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ func TestAddSubscriptionLevelRateLimitPolicy(t *testing.T) {
DefaultLimit: &types.SubscriptionDefaultLimit{
QuotaType: "requestCount",
RequestCount: &types.SubscriptionRequestCount{
RequestCount: 2147483647,
RequestCount: -1,
TimeUnit: "min",
},
},
Expand All @@ -652,7 +652,7 @@ func TestAddSubscriptionLevelRateLimitPolicy(t *testing.T) {
DefaultLimit: &types.SubscriptionDefaultLimit{
QuotaType: "requestCount",
RequestCount: &types.SubscriptionRequestCount{
RequestCount: 2147483647,
RequestCount: -1,
TimeUnit: "min",
},
},
Expand Down
Loading