Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

- uses: bufbuild/buf-setup-action@35c243d7f2a909b1d4e40399b348a7fdab27d78d # v1.34.0

- name: buf lint and breaking
- name: buf lint, format, and breaking
uses: bufbuild/buf-action@91da6f6a1a2c877c182debad24ca0a8a9d848be7 # v1
with:
lint: true
breaking: true
format: false
format: true
breaking_against: 'https://github.com/getsentry/sentry-protos.git#branch=main'

codegen-rust:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package sentry_protos.billing.v1.services.billing_details.v1;
import "sentry_protos/billing/v1/services/billing_details/v1/billing_details.proto";

message GetBillingDetailsRequest {
uint64 organization_id = 1;
uint64 organization_id = 1;
}

message GetBillingDetailsResponse {
BillingDetails billing_details = 1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ syntax = "proto3";
package sentry_protos.billing.v1.services.charge.v1;

message Charge {
uint64 amount_cents = 1;
bool paid = 2;
optional string failure_code = 3;
uint64 amount_cents = 1;
bool paid = 2;
optional string failure_code = 3;
}

// No pagination on this request because there are expected to be only a handful
// of attempted charges per invoice.
message ListChargesForInvoiceRequest {
uint64 invoice_id = 1;
uint64 invoice_id = 1;
}

message ListChargesForInvoiceResponse {
repeated Charge charges = 1;
}
repeated Charge charges = 1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ message BillingConfig {
BillingType billing_type = 1;

// Remaining fields are deprecated
BillingChannel channel = 2 [deprecated=true];
ExternalBillingProvider external_billing_provider = 3 [deprecated=true];
Address address = 4 [deprecated=true];
BillingChannel channel = 2 [deprecated = true];
ExternalBillingProvider external_billing_provider = 3 [deprecated = true];
Address address = 4 [deprecated = true];
// Use PricingConfig.billing_period_start_date and PricingConfig.billing_period_end_date
Date contract_start_date = 5 [deprecated = true];
Date contract_end_date = 6 [deprecated = true];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ package sentry_protos.billing.v1.services.contract.v1;
import "sentry_protos/billing/v1/services/contract/v1/pricing_config.proto";

message CreateContractRequest {
uint64 organization_id = 1;
string package_uid = 2;
repeated UserConfig user_configs = 3;
uint64 organization_id = 1;
string package_uid = 2;
repeated UserConfig user_configs = 3;
}

message CreateContractResponse {
uint64 id = 1;
uint64 id = 1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package sentry_protos.billing.v1.services.contract.v1;
import "sentry_protos/billing/v1/services/contract/v1/invoice.proto";

message GetInvoiceRequest {
uint64 invoice_id = 1;
uint64 invoice_id = 1;
}

message GetInvoiceResponse {
Invoice invoice = 1;
}
Invoice invoice = 1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import "sentry_protos/billing/v1/services/contract/v1/invoice.proto";
// Creates a new contract for a new billing period. Closes out the current contract by
// creating an invoice and setting the last usage date
message RolloverContractRequest {
uint64 contract_id = 1;
google.protobuf.Timestamp last_usage_ts = 2;
repeated InvoiceLineItem line_items = 3;
uint64 contract_id = 1;
google.protobuf.Timestamp last_usage_ts = 2;
repeated InvoiceLineItem line_items = 3;
}

message RolloverContractResponse {
uint64 invoice_id = 1;
bool needs_charge = 2;
uint64 amount_billed = 3;
uint64 invoice_id = 1;
bool needs_charge = 2;
uint64 amount_billed = 3;
}
22 changes: 11 additions & 11 deletions proto/sentry_protos/billing/v1/services/contract/v1/invoice.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ import "google/protobuf/timestamp.proto";
// This is not the same as LineItemDetails, it includes
// items not related to the package such as tax.
message InvoiceLineItem {
// Intentionally not a uint (some line items could be discounts)
int64 amount_cents = 1;
optional string description = 2;
// Intentionally not a uint (some line items could be discounts)
int64 amount_cents = 1;
optional string description = 2;
}

message Invoice {
uint64 invoice_id = 1;
repeated InvoiceLineItem line_items = 2;
// Not just a sum of line items since there may be credit applied
uint64 amount_billed = 3;
uint64 organization_id = 4;
bool paid = 5;
google.protobuf.Timestamp date_added = 6;
string guid = 7;
uint64 invoice_id = 1;
repeated InvoiceLineItem line_items = 2;
// Not just a sum of line items since there may be credit applied
uint64 amount_billed = 3;
uint64 organization_id = 4;
bool paid = 5;
google.protobuf.Timestamp date_added = 6;
string guid = 7;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,40 @@ syntax = "proto3";
package sentry_protos.billing.v1.services.invoicer.v1;

message GeneratePdfRequest {
uint64 invoice_id = 1;
string invoice_guid = 2;
uint64 invoice_id = 1;
string invoice_guid = 2;
}

message PdfData {
// Right-aligned lines drawn at the top of the page (e.g. company address
// and tax IDs).
repeated string header = 1;

// Left column of pre-formatted text lines drawn below the header.
repeated string billing_lines = 2;

// Right column below the header. Each entry renders as the `label` drawn
// in one text column and the corresponding `value` drawn in the next.
message LabeledLine {
string label = 1;
string value = 2;
}
repeated LabeledLine invoice_lines = 3;

// Rows of the invoice line-item table. The first row is the header row
// ("Description" / "Amount"); every subsequent row has the same number of
// cells. Cells may contain reportlab markup (e.g. <b>, <br/>, <small>) for
// multi-line/styled descriptions.
message TableRow {
repeated string cells = 1;
}
repeated TableRow table_data = 4;

// Optional FTC disclaimer paragraph drawn below the table.
optional string disclaimer = 5;
// Right-aligned lines drawn at the top of the page (e.g. company address
// and tax IDs).
repeated string header = 1;

// Left column of pre-formatted text lines drawn below the header.
repeated string billing_lines = 2;

// Right column below the header. Each entry renders as the `label` drawn
// in one text column and the corresponding `value` drawn in the next.
message LabeledLine {
string label = 1;
string value = 2;
}
repeated LabeledLine invoice_lines = 3;

// Rows of the invoice line-item table. The first row is the header row
// ("Description" / "Amount"); every subsequent row has the same number of
// cells. Cells may contain reportlab markup (e.g. <b>, <br/>, <small>) for
// multi-line/styled descriptions.
message TableRow {
repeated string cells = 1;
}
repeated TableRow table_data = 4;

// Optional FTC disclaimer paragraph drawn below the table.
optional string disclaimer = 5;
}

message GeneratePdfResponse {
PdfData pdf_data = 1;
string filename = 2;
PdfData pdf_data = 1;
string filename = 2;
}
Loading