Skip to content

refactor: deprecate billing_id and project_id in entitlement and usag… #438

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
whoAbhishekSah wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: deprecate billing_id and project_id in entitlement and usag… #438

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
18 changes: 10 additions & 8 deletions raystack/frontier/v1beta1/admin.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,16 +1094,18 @@ message ListAllBillingAccountsResponse {
}

message RevertBillingUsageRequest {
// either provide org_id or infer org from project_id
string org_id = 1;
string project_id = 2;
// DEPRECATED
string project_id = 2 [deprecated = true];

// either provide billing_id of the org or API can infer the default
// billing ID from either org_id or project_id, not both
string billing_id = 3 [(validate.rules).string = {
ignore_empty: true,
uuid: true
}];
// DEPRECATED: billing_id will be inferred from org_id
string billing_id = 3 [
deprecated = true,
(validate.rules).string = {
ignore_empty: true,
uuid: true
}
];

// usage id to revert, a usage can only be allowed to revert once
string usage_id = 4 [(validate.rules).string = {uuid: true}];
Expand Down
36 changes: 20 additions & 16 deletions raystack/frontier/v1beta1/frontier.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,15 +2030,17 @@ message HasTrialedResponse {

message CreateBillingUsageRequest {
string org_id = 1;
// ID of the billing account to update the subscription for
string billing_id = 2 [(validate.rules).string = {
ignore_empty: true,
uuid: true
}];
// DEPRECATED: billing_id will be inferred from org_id
string billing_id = 2 [
deprecated = true,
(validate.rules).string = {
ignore_empty: true,
uuid: true
}
];

// either provide billing_id of the org or API can infer the default
// billing ID from either org_id or project_id, not both
string project_id = 4;
// DEPRECATED
string project_id = 4 [deprecated = true];

// Usage to create
repeated Usage usages = 3;
Expand Down Expand Up @@ -2253,15 +2255,17 @@ message ListPlansResponse {

message CheckFeatureEntitlementRequest {
string org_id = 1;
// ID of the billing account to update the subscription for
string billing_id = 2 [(validate.rules).string = {
ignore_empty: true,
uuid: true
}];
// DEPRECATED: billing_id will be inferred from org_id
string billing_id = 2 [
deprecated = true,
(validate.rules).string = {
ignore_empty: true,
uuid: true
}
];

// either provide billing_id of the org or API can infer the default
// billing ID from either org_id or project_id, not both
string project_id = 4;
// DEPRECATED
string project_id = 4 [deprecated = true];

// feature or product name
string feature = 3 [(validate.rules).string.min_len = 1];
Expand Down
Loading