From 87e6e40af551fb01663ff4e62be2c93813179f39 Mon Sep 17 00:00:00 2001 From: rriski Date: Tue, 10 Dec 2024 12:56:52 +0200 Subject: [PATCH] Revert "chore(update): bump openapi schema (2024-12-10)" (#200) --- handler/account/account.go | 4 ++-- handler/billinggroup/billinggroup.go | 15 +++++++-------- handler/kafka/kafka.go | 1 + handler/project/project.go | 8 ++++---- handler/user/user.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/handler/account/account.go b/handler/account/account.go index 7efb22b..abbd413 100644 --- a/handler/account/account.go +++ b/handler/account/account.go @@ -351,7 +351,7 @@ type AccountBillingGroupOut struct { EstimatedBalanceUsd string `json:"estimated_balance_usd"` // Estimated balance in USD, before tax PaymentMethod PaymentMethodType `json:"payment_method"` // Payment method ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State string `json:"state"` // Address state or province + State string `json:"state"` // Address state VatId string `json:"vat_id"` // EU VAT Identification Number ZipCode string `json:"zip_code"` // Address zip code } @@ -645,7 +645,7 @@ type ProjectOut struct { OrganizationId string `json:"organization_id"` // Organization ID PaymentMethod string `json:"payment_method"` // Payment method ProjectName string `json:"project_name"` // Project name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Tags map[string]string `json:"tags,omitempty"` // Set of resource tags TechEmails []TechEmailOut `json:"tech_emails,omitempty"` // List of project tech email addresses TenantId *string `json:"tenant_id,omitempty"` // Tenant ID diff --git a/handler/billinggroup/billinggroup.go b/handler/billinggroup/billinggroup.go index 18aafdc..85f1ef8 100644 --- a/handler/billinggroup/billinggroup.go +++ b/handler/billinggroup/billinggroup.go @@ -279,7 +279,7 @@ type BillingGroupCreateIn struct { CopyFromBillingGroup *string `json:"copy_from_billing_group,omitempty"` // Billing group ID CountryCode *string `json:"country_code,omitempty"` // Two letter country code for billing country ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state VatId *string `json:"vat_id,omitempty"` // EU VAT Identification Number ZipCode *string `json:"zip_code,omitempty"` // Address zip code } @@ -307,7 +307,7 @@ type BillingGroupCreateOut struct { EstimatedBalanceUsd string `json:"estimated_balance_usd"` // Estimated balance in USD, before tax PaymentMethod PaymentMethodType `json:"payment_method"` // Payment method ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State string `json:"state"` // Address state or province + State string `json:"state"` // Address state VatId string `json:"vat_id"` // EU VAT Identification Number ZipCode string `json:"zip_code"` // Address zip code } @@ -350,7 +350,7 @@ type BillingGroupGetOut struct { EstimatedBalanceUsd string `json:"estimated_balance_usd"` // Estimated balance in USD, before tax PaymentMethod PaymentMethodType `json:"payment_method"` // Payment method ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State string `json:"state"` // Address state or province + State string `json:"state"` // Address state VatId string `json:"vat_id"` // EU VAT Identification Number ZipCode string `json:"zip_code"` // Address zip code } @@ -376,7 +376,7 @@ type BillingGroupOut struct { EstimatedBalanceUsd string `json:"estimated_balance_usd"` // Estimated balance in USD, before tax PaymentMethod PaymentMethodType `json:"payment_method"` // Payment method ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State string `json:"state"` // Address state or province + State string `json:"state"` // Address state VatId string `json:"vat_id"` // EU VAT Identification Number ZipCode string `json:"zip_code"` // Address zip code } @@ -410,7 +410,7 @@ type BillingGroupUpdateIn struct { Company *string `json:"company,omitempty"` // Name of a company CountryCode *string `json:"country_code,omitempty"` // Two letter country code for billing country ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state VatId *string `json:"vat_id,omitempty"` // EU VAT Identification Number ZipCode *string `json:"zip_code,omitempty"` // Address zip code } @@ -438,7 +438,7 @@ type BillingGroupUpdateOut struct { EstimatedBalanceUsd string `json:"estimated_balance_usd"` // Estimated balance in USD, before tax PaymentMethod PaymentMethodType `json:"payment_method"` // Payment method ShippingAddressId *string `json:"shipping_address_id,omitempty"` // Address ID - State string `json:"state"` // Address state or province + State string `json:"state"` // Address state VatId string `json:"vat_id"` // EU VAT Identification Number ZipCode string `json:"zip_code"` // Address zip code } @@ -614,7 +614,6 @@ type ServiceType string const ( ServiceTypeAlertmanager ServiceType = "alertmanager" ServiceTypeAlloydbomni ServiceType = "alloydbomni" - ServiceTypeApplication ServiceType = "application" ServiceTypeCassandra ServiceType = "cassandra" ServiceTypeClickhouse ServiceType = "clickhouse" ServiceTypeDragonfly ServiceType = "dragonfly" @@ -647,7 +646,7 @@ const ( ) func ServiceTypeChoices() []string { - return []string{"alertmanager", "alloydbomni", "application", "cassandra", "clickhouse", "dragonfly", "elasticsearch", "flink", "grafana", "influxdb", "kafka", "kafka_connect", "kafka_mirrormaker", "m3aggregator", "m3db", "mysql", "opensearch", "parca", "pg", "redis", "stresstester", "sw", "thanos", "thanoscompactor", "thanosquery", "thanosreceiver", "thanosruler", "thanosstore", "valkey", "vector", "vmalert", "warpstream"} + return []string{"alertmanager", "alloydbomni", "cassandra", "clickhouse", "dragonfly", "elasticsearch", "flink", "grafana", "influxdb", "kafka", "kafka_connect", "kafka_mirrormaker", "m3aggregator", "m3db", "mysql", "opensearch", "parca", "pg", "redis", "stresstester", "sw", "thanos", "thanoscompactor", "thanosquery", "thanosreceiver", "thanosruler", "thanosstore", "valkey", "vector", "vmalert", "warpstream"} } // billingGroupCreateOut BillingGroupCreateResponse diff --git a/handler/kafka/kafka.go b/handler/kafka/kafka.go index 1c9c663..7254fca 100644 --- a/handler/kafka/kafka.go +++ b/handler/kafka/kafka.go @@ -338,6 +338,7 @@ type QuotaOut struct { RequestPercentage float64 `json:"request_percentage"` // cpu percentage throttle User string `json:"user"` // user } + type ResourceType string const ( diff --git a/handler/project/project.go b/handler/project/project.go index f8e470b..ee21b51 100644 --- a/handler/project/project.go +++ b/handler/project/project.go @@ -771,7 +771,7 @@ type ProjectCreateOut struct { OrganizationId string `json:"organization_id"` // Organization ID PaymentMethod string `json:"payment_method"` // Payment method ProjectName string `json:"project_name"` // Project name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Tags map[string]string `json:"tags,omitempty"` // Set of resource tags TechEmails []TechEmailOut `json:"tech_emails,omitempty"` // List of project tech email addresses TenantId *string `json:"tenant_id,omitempty"` // Tenant ID @@ -805,7 +805,7 @@ type ProjectGetOut struct { OrganizationId string `json:"organization_id"` // Organization ID PaymentMethod string `json:"payment_method"` // Payment method ProjectName string `json:"project_name"` // Project name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Tags map[string]string `json:"tags,omitempty"` // Set of resource tags TechEmails []TechEmailOut `json:"tech_emails,omitempty"` // List of project tech email addresses TenantId *string `json:"tenant_id,omitempty"` // Tenant ID @@ -865,7 +865,7 @@ type ProjectOut struct { OrganizationId string `json:"organization_id"` // Organization ID PaymentMethod string `json:"payment_method"` // Payment method ProjectName string `json:"project_name"` // Project name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Tags map[string]string `json:"tags,omitempty"` // Set of resource tags TechEmails []TechEmailOut `json:"tech_emails,omitempty"` // List of project tech email addresses TenantId *string `json:"tenant_id,omitempty"` // Tenant ID @@ -994,7 +994,7 @@ type ProjectUpdateOut struct { OrganizationId string `json:"organization_id"` // Organization ID PaymentMethod string `json:"payment_method"` // Payment method ProjectName string `json:"project_name"` // Project name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Tags map[string]string `json:"tags,omitempty"` // Set of resource tags TechEmails []TechEmailOut `json:"tech_emails,omitempty"` // List of project tech email addresses TenantId *string `json:"tenant_id,omitempty"` // Tenant ID diff --git a/handler/user/user.go b/handler/user/user.go index 6d70a8d..c84dcb2 100644 --- a/handler/user/user.go +++ b/handler/user/user.go @@ -719,7 +719,7 @@ type UserCreateIn struct { Origin *string `json:"origin,omitempty"` // Origin of the user Password *string `json:"password,omitempty"` // User password RealName string `json:"real_name"` // User real name - State *string `json:"state,omitempty"` // Address state or province + State *string `json:"state,omitempty"` // Address state Token *string `json:"token,omitempty"` // Signup token for single sign-on linking }