diff --git a/client_mock.go b/client_mock.go index 407a2bb..859786a 100644 --- a/client_mock.go +++ b/client_mock.go @@ -343,8 +343,8 @@ func (_c *MockClient_AccessTokenUpdate_Call) RunAndReturn(run func(ctx context.C } // AccountAttachPaymentMethod provides a mock function for the type MockClient -func (_mock *MockClient) AccountAttachPaymentMethod(ctx context.Context, accountId string, in *account.AccountAttachPaymentMethodIn) (*account.AccountAttachPaymentMethodOut, error) { - ret := _mock.Called(ctx, accountId, in) +func (_mock *MockClient) AccountAttachPaymentMethod(ctx context.Context, accountId string) (*account.AccountAttachPaymentMethodOut, error) { + ret := _mock.Called(ctx, accountId) if len(ret) == 0 { panic("no return value specified for AccountAttachPaymentMethod") @@ -352,18 +352,18 @@ func (_mock *MockClient) AccountAttachPaymentMethod(ctx context.Context, account var r0 *account.AccountAttachPaymentMethodOut var r1 error - if returnFunc, ok := ret.Get(0).(func(context.Context, string, *account.AccountAttachPaymentMethodIn) (*account.AccountAttachPaymentMethodOut, error)); ok { - return returnFunc(ctx, accountId, in) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) (*account.AccountAttachPaymentMethodOut, error)); ok { + return returnFunc(ctx, accountId) } - if returnFunc, ok := ret.Get(0).(func(context.Context, string, *account.AccountAttachPaymentMethodIn) *account.AccountAttachPaymentMethodOut); ok { - r0 = returnFunc(ctx, accountId, in) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) *account.AccountAttachPaymentMethodOut); ok { + r0 = returnFunc(ctx, accountId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*account.AccountAttachPaymentMethodOut) } } - if returnFunc, ok := ret.Get(1).(func(context.Context, string, *account.AccountAttachPaymentMethodIn) error); ok { - r1 = returnFunc(ctx, accountId, in) + if returnFunc, ok := ret.Get(1).(func(context.Context, string) error); ok { + r1 = returnFunc(ctx, accountId) } else { r1 = ret.Error(1) } @@ -378,12 +378,11 @@ type MockClient_AccountAttachPaymentMethod_Call struct { // AccountAttachPaymentMethod is a helper method to define mock.On call // - ctx context.Context // - accountId string -// - in *account.AccountAttachPaymentMethodIn -func (_e *MockClient_Expecter) AccountAttachPaymentMethod(ctx interface{}, accountId interface{}, in interface{}) *MockClient_AccountAttachPaymentMethod_Call { - return &MockClient_AccountAttachPaymentMethod_Call{Call: _e.mock.On("AccountAttachPaymentMethod", ctx, accountId, in)} +func (_e *MockClient_Expecter) AccountAttachPaymentMethod(ctx interface{}, accountId interface{}) *MockClient_AccountAttachPaymentMethod_Call { + return &MockClient_AccountAttachPaymentMethod_Call{Call: _e.mock.On("AccountAttachPaymentMethod", ctx, accountId)} } -func (_c *MockClient_AccountAttachPaymentMethod_Call) Run(run func(ctx context.Context, accountId string, in *account.AccountAttachPaymentMethodIn)) *MockClient_AccountAttachPaymentMethod_Call { +func (_c *MockClient_AccountAttachPaymentMethod_Call) Run(run func(ctx context.Context, accountId string)) *MockClient_AccountAttachPaymentMethod_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { @@ -393,14 +392,9 @@ func (_c *MockClient_AccountAttachPaymentMethod_Call) Run(run func(ctx context.C if args[1] != nil { arg1 = args[1].(string) } - var arg2 *account.AccountAttachPaymentMethodIn - if args[2] != nil { - arg2 = args[2].(*account.AccountAttachPaymentMethodIn) - } run( arg0, arg1, - arg2, ) }) return _c @@ -411,7 +405,7 @@ func (_c *MockClient_AccountAttachPaymentMethod_Call) Return(accountAttachPaymen return _c } -func (_c *MockClient_AccountAttachPaymentMethod_Call) RunAndReturn(run func(ctx context.Context, accountId string, in *account.AccountAttachPaymentMethodIn) (*account.AccountAttachPaymentMethodOut, error)) *MockClient_AccountAttachPaymentMethod_Call { +func (_c *MockClient_AccountAttachPaymentMethod_Call) RunAndReturn(run func(ctx context.Context, accountId string) (*account.AccountAttachPaymentMethodOut, error)) *MockClient_AccountAttachPaymentMethod_Call { _c.Call.Return(run) return _c } diff --git a/handler/account/account.go b/handler/account/account.go index b612a6f..bc0dfe5 100644 --- a/handler/account/account.go +++ b/handler/account/account.go @@ -14,7 +14,7 @@ type Handler interface { // Deprecated: AccountAttachPaymentMethod attach payment method for account // POST /v1/account/{account_id}/payment_methods // https://api.aiven.io/doc/#tag/Account/operation/AccountAttachPaymentMethod - AccountAttachPaymentMethod(ctx context.Context, accountId string, in *AccountAttachPaymentMethodIn) (*AccountAttachPaymentMethodOut, error) + AccountAttachPaymentMethod(ctx context.Context, accountId string) (*AccountAttachPaymentMethodOut, error) // Deprecated: AccountBillingGroupList list account billing groups // GET /v1/account/{account_id}/billing-group @@ -105,9 +105,9 @@ type AccountHandler struct { doer doer } -func (h *AccountHandler) AccountAttachPaymentMethod(ctx context.Context, accountId string, in *AccountAttachPaymentMethodIn) (*AccountAttachPaymentMethodOut, error) { +func (h *AccountHandler) AccountAttachPaymentMethod(ctx context.Context, accountId string) (*AccountAttachPaymentMethodOut, error) { path := fmt.Sprintf("/v1/account/%s/payment_methods", url.PathEscape(accountId)) - b, err := h.doer.Do(ctx, "AccountAttachPaymentMethod", "POST", path, in) + b, err := h.doer.Do(ctx, "AccountAttachPaymentMethod", "POST", path, nil) if err != nil { return nil, err } @@ -311,11 +311,6 @@ func AccessSourceTypeChoices() []string { return []string{"descendant_membership", "organization_membership", "project_membership", "team_membership"} } -// AccountAttachPaymentMethodIn AccountAttachPaymentMethodRequestBody -type AccountAttachPaymentMethodIn struct { - PaymentMethodId string `json:"payment_method_id"` // Unique identifier for a Stripe payment method -} - // AccountAttachPaymentMethodOut User credit card information type AccountAttachPaymentMethodOut struct { Brand string `json:"brand"` diff --git a/handler/organizationbilling/organizationbilling.go b/handler/organizationbilling/organizationbilling.go index 37f2ea6..97bdcec 100644 --- a/handler/organizationbilling/organizationbilling.go +++ b/handler/organizationbilling/organizationbilling.go @@ -242,15 +242,17 @@ type PaymentMethodType string const ( PaymentMethodTypeAWSSubscription PaymentMethodType = "aws_subscription" + PaymentMethodTypeAWSSubscriptionV1 PaymentMethodType = "aws_subscription_v1" PaymentMethodTypeAzureSubscription PaymentMethodType = "azure_subscription" PaymentMethodTypeBankTransfer PaymentMethodType = "bank_transfer" PaymentMethodTypeCreditCard PaymentMethodType = "credit_card" PaymentMethodTypeCustom PaymentMethodType = "custom" PaymentMethodTypeGcpSubscription PaymentMethodType = "gcp_subscription" + PaymentMethodTypeGcpSubscriptionV1 PaymentMethodType = "gcp_subscription_v1" ) func PaymentMethodTypeChoices() []string { - return []string{"aws_subscription", "azure_subscription", "bank_transfer", "credit_card", "custom", "gcp_subscription"} + return []string{"aws_subscription", "aws_subscription_v1", "azure_subscription", "bank_transfer", "credit_card", "custom", "gcp_subscription", "gcp_subscription_v1"} } type PaymentMethodsListOut struct { diff --git a/handler/service/service.go b/handler/service/service.go index c849291..060e6c6 100644 --- a/handler/service/service.go +++ b/handler/service/service.go @@ -1212,6 +1212,7 @@ const ( IntegrationTypeOpensearchCrossClusterReplication IntegrationType = "opensearch_cross_cluster_replication" IntegrationTypeOpensearchCrossClusterSearch IntegrationType = "opensearch_cross_cluster_search" IntegrationTypeOpentelemetry IntegrationType = "opentelemetry" + IntegrationTypePostgresqlClickhouseCdc IntegrationType = "postgresql_clickhouse_cdc" IntegrationTypePrometheus IntegrationType = "prometheus" IntegrationTypeReadReplica IntegrationType = "read_replica" IntegrationTypeRsyslog IntegrationType = "rsyslog" @@ -1230,7 +1231,7 @@ const ( ) func IntegrationTypeChoices() []string { - return []string{"alert_triage_kafka", "alertmanager", "application_service_credential", "autoscaler", "autoscaler_service", "caching", "clickhouse_credentials", "clickhouse_kafka", "clickhouse_postgresql", "dashboard", "datadog", "datahub_metadata_ingestion", "datasource", "disaster_recovery", "external_aws_cloudwatch_logs", "external_aws_cloudwatch_metrics", "external_elasticsearch_logs", "external_google_cloud_logging", "external_opensearch_logs", "flink", "flink_external_bigquery", "flink_external_kafka", "flink_external_postgresql", "internal_connectivity", "jolokia", "kafka_connect", "kafka_connect_postgresql", "kafka_inkless_postgresql", "kafka_logs", "kafka_mirrormaker", "logs", "metrics", "opensearch_cross_cluster_replication", "opensearch_cross_cluster_search", "opentelemetry", "prometheus", "read_replica", "rsyslog", "schema_registry_proxy", "service_composition", "stresstester", "thanos_distributed_query", "thanos_migrate", "thanos_object_storage", "thanoscompactor", "thanosquery", "thanosruler", "thanosstore", "vector", "vmalert"} + return []string{"alert_triage_kafka", "alertmanager", "application_service_credential", "autoscaler", "autoscaler_service", "caching", "clickhouse_credentials", "clickhouse_kafka", "clickhouse_postgresql", "dashboard", "datadog", "datahub_metadata_ingestion", "datasource", "disaster_recovery", "external_aws_cloudwatch_logs", "external_aws_cloudwatch_metrics", "external_elasticsearch_logs", "external_google_cloud_logging", "external_opensearch_logs", "flink", "flink_external_bigquery", "flink_external_kafka", "flink_external_postgresql", "internal_connectivity", "jolokia", "kafka_connect", "kafka_connect_postgresql", "kafka_inkless_postgresql", "kafka_logs", "kafka_mirrormaker", "logs", "metrics", "opensearch_cross_cluster_replication", "opensearch_cross_cluster_search", "opentelemetry", "postgresql_clickhouse_cdc", "prometheus", "read_replica", "rsyslog", "schema_registry_proxy", "service_composition", "stresstester", "thanos_distributed_query", "thanos_migrate", "thanos_object_storage", "thanoscompactor", "thanosquery", "thanosruler", "thanosstore", "vector", "vmalert"} } type IntegrationTypeOut struct {