diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04a32a10..80134067 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [1.8.0] - 2024-09-18
+
+### Added
+
+- `upgrade_type` was added as an attribute for serverless clusters.
+- New `STANDARD` clusters with provisioned serverless capacity.
+- Ability to upgrade from `BASIC` plan to `STANDARD` plan.
+
+### Changed
+
+- Renamed `SERVERLESS` plan type to `BASIC`.
+- Renamed `DEDICATED` plan type to `ADVANCED`.
+
+### Fixed
+
+- Fixed error when the primary attribute was specified in multiple regions,
+ even when false in all but one region.
+
+### Deprecated
+
+- Deprecated support for `spend_limit` attribute in `serverless` config. Users
+ can instead enforce resource limits with `usage_limits`.
+
## Fixed
- Updated to version 2.0.1 of cockroach-cloud-sdk-go
diff --git a/Makefile b/Makefile
index 2a5f6042..057c325e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@ NAMESPACE=cockroachdb
NAME=cockroach
BINARY=terraform-provider-${NAME}
VERSION=1.6.0
-OS_ARCH=darwin_amd64
+OS := $(shell uname | tr A-Z a-z)
+ARCH := $(shell uname -m | sed 's/x86_64/amd64/')
+OS_ARCH := $(OS)_$(ARCH)
default: install
@@ -16,7 +18,7 @@ generate:
go generate
update-sdk:
- go get github.com/cockroachdb/cockroach-cloud-sdk-go/v2
+ go get github.com/cockroachdb/cockroach-cloud-sdk-go/v3
go generate ./mock
release:
@@ -33,10 +35,17 @@ release:
GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386
GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64
+# Use this to install a development binary to your local machine, in the TF
+# provider cache. Note that if this directory is present, using an "official"
+# version of the provider is disabled. Use "make clean" to reset.
install: build
mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
mv ${BINARY} ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
+clean:
+ rm -rf ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/
+ go clean -testcache -i -x
+
test:
go test ./... -v $(TESTARGS) -timeout 5m
diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
index f168d8d4..a71baa37 100644
--- a/docs/data-sources/cluster.md
+++ b/docs/data-sources/cluster.md
@@ -40,7 +40,7 @@ data "cockroach_cluster" "cockroach" {
- `name` (String) Name of the cluster.
- `operation_status` (String) Describes the current long-running operation, if any.
- `parent_id` (String) The ID of the cluster's parent folder. 'root' is used for a cluster at the root level.
-- `plan` (String) Denotes cluster deployment type: 'DEDICATED' or 'SERVERLESS'.
+- `plan` (String) Denotes cluster plan type: 'BASIC' or 'STANDARD' or 'ADVANCED'.
- `regions` (Attributes List) (see [below for nested schema](#nestedatt--regions))
- `serverless` (Attributes) (see [below for nested schema](#nestedatt--serverless))
- `state` (String) Describes whether the cluster is being created, updated, deleted, etc.
@@ -78,7 +78,8 @@ Read-Only:
Read-Only:
- `routing_id` (String) Cluster identifier in a connection string.
-- `spend_limit` (Number) Spend limit in US cents.
+- `spend_limit` (Number, Deprecated) Spend limit in US cents.
+- `upgrade_type` (String) Dictates the behavior of cockroach major version upgrades.
- `usage_limits` (Attributes) (see [below for nested schema](#nestedatt--serverless--usage_limits))
@@ -86,5 +87,6 @@ Read-Only:
Read-Only:
+- `provisioned_virtual_cpus` (Number) Maximum number of vCPUs that the cluster can use.
- `request_unit_limit` (Number) Maximum number of Request Units that the cluster can consume during the month.
- `storage_mib_limit` (Number) Maximum amount of storage (in MiB) that the cluster can have at any time during the month.
diff --git a/docs/resources/cluster.md b/docs/resources/cluster.md
index 9ef458ab..24ca4332 100644
--- a/docs/resources/cluster.md
+++ b/docs/resources/cluster.md
@@ -3,22 +3,23 @@
page_title: "cockroach_cluster Resource - terraform-provider-cockroach"
subcategory: ""
description: |-
- CockroachDB Cloud cluster. Can be Dedicated or Serverless.
+ CockroachDB Cloud cluster.
---
# cockroach_cluster (Resource)
-CockroachDB Cloud cluster. Can be Dedicated or Serverless.
+CockroachDB Cloud cluster.
## Example Usage
```terraform
-resource "cockroach_cluster" "dedicated" {
- name = "cockroach-dedicated"
+resource "cockroach_cluster" "advanced" {
+ name = "cockroach-advanced"
cloud_provider = "GCP"
+ plan = "ADVANCED"
dedicated = {
storage_gib = 15
- machine_type = "n1-standard-4"
+ machine_type = "n2-standard-4"
}
regions = [
{
@@ -29,11 +30,15 @@ resource "cockroach_cluster" "dedicated" {
delete_protection = true
}
-resource "cockroach_cluster" "serverless" {
- name = "cockroach-serverless"
+resource "cockroach_cluster" "standard" {
+ name = "cockroach-standard"
cloud_provider = "GCP"
+ plan = "STANDARD"
serverless = {
- spend_limit = 1
+ usage_limits = {
+ provisioned_virtual_cpus = 2
+ }
+ upgrade_type = "AUTOMATIC"
}
regions = [
{
@@ -42,6 +47,19 @@ resource "cockroach_cluster" "serverless" {
]
delete_protection = false
}
+
+resource "cockroach_cluster" "basic" {
+ name = "cockroach-basic"
+ cloud_provider = "GCP"
+ plan = "BASIC"
+ serverless = {}
+ regions = [
+ {
+ name = "us-east1"
+ }
+ ]
+ delete_protection = false
+}
```
@@ -62,6 +80,7 @@ resource "cockroach_cluster" "serverless" {
- `dedicated` (Attributes) (see [below for nested schema](#nestedatt--dedicated))
- `delete_protection` (Boolean) Set to true to enable delete protection on the cluster. If unset, the server chooses the value on cluster creation, and preserves the value on cluster update.
- `parent_id` (String) The ID of the cluster's parent folder. 'root' is used for a cluster at the root level.
+- `plan` (String) Denotes cluster plan type: 'BASIC' or 'STANDARD' or 'ADVANCED'.
- `serverless` (Attributes) (see [below for nested schema](#nestedatt--serverless))
### Read-Only
@@ -70,7 +89,6 @@ resource "cockroach_cluster" "serverless" {
- `creator_id` (String) ID of the user who created the cluster.
- `id` (String) The ID of this resource.
- `operation_status` (String) Describes the current long-running operation, if any.
-- `plan` (String) Denotes cluster deployment type: 'DEDICATED' or 'SERVERLESS'.
- `state` (String) Describes whether the cluster is being created, updated, deleted, etc.
- `upgrade_status` (String) Describes the status of any in-progress CockroachDB upgrade or rollback.
@@ -84,7 +102,7 @@ Required:
Optional:
- `node_count` (Number) Number of nodes in the region. Will always be 0 for serverless clusters.
-- `primary` (Boolean) Set to true to mark this region as the primary for a Serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.
+- `primary` (Boolean) Set to true to mark this region as the primary for a serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.
Read-Only:
@@ -114,7 +132,10 @@ Read-Only:
Optional:
-- `spend_limit` (Number) Spend limit in US cents.
+- `spend_limit` (Number, Deprecated) Spend limit in US cents.
+- `upgrade_type` (String) Dictates the behavior of cockroach major version upgrades. If plan type is 'BASIC', this attribute must be left empty or set to 'AUTOMATIC'. Allowed values are:
+ * MANUAL
+ * AUTOMATIC
- `usage_limits` (Attributes) (see [below for nested schema](#nestedatt--serverless--usage_limits))
Read-Only:
@@ -124,7 +145,8 @@ Read-Only:
### Nested Schema for `serverless.usage_limits`
-Required:
+Optional:
+- `provisioned_virtual_cpus` (Number) Maximum number of vCPUs that the cluster can use.
- `request_unit_limit` (Number) Maximum number of Request Units that the cluster can consume during the month.
- `storage_mib_limit` (Number) Maximum amount of storage (in MiB) that the cluster can have at any time during the month.
diff --git a/docs/resources/cmek.md b/docs/resources/cmek.md
index e5d51559..07335b3c 100644
--- a/docs/resources/cmek.md
+++ b/docs/resources/cmek.md
@@ -82,7 +82,7 @@ Required:
Optional:
- `node_count` (Number) Number of nodes in the region. Will always be 0 for serverless clusters.
-- `primary` (Boolean) Set to true to mark this region as the primary for a Serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.
+- `primary` (Boolean) Set to true to mark this region as the primary for a serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.
Read-Only:
diff --git a/examples/resources/cockroach_cluster/resource.tf b/examples/resources/cockroach_cluster/resource.tf
index 8d80998c..39149d5a 100644
--- a/examples/resources/cockroach_cluster/resource.tf
+++ b/examples/resources/cockroach_cluster/resource.tf
@@ -1,9 +1,10 @@
-resource "cockroach_cluster" "dedicated" {
- name = "cockroach-dedicated"
+resource "cockroach_cluster" "advanced" {
+ name = "cockroach-advanced"
cloud_provider = "GCP"
+ plan = "ADVANCED"
dedicated = {
storage_gib = 15
- machine_type = "n1-standard-4"
+ machine_type = "n2-standard-4"
}
regions = [
{
@@ -14,11 +15,15 @@ resource "cockroach_cluster" "dedicated" {
delete_protection = true
}
-resource "cockroach_cluster" "serverless" {
- name = "cockroach-serverless"
+resource "cockroach_cluster" "standard" {
+ name = "cockroach-standard"
cloud_provider = "GCP"
+ plan = "STANDARD"
serverless = {
- spend_limit = 1
+ usage_limits = {
+ provisioned_virtual_cpus = 2
+ }
+ upgrade_type = "AUTOMATIC"
}
regions = [
{
@@ -27,3 +32,16 @@ resource "cockroach_cluster" "serverless" {
]
delete_protection = false
}
+
+resource "cockroach_cluster" "basic" {
+ name = "cockroach-basic"
+ cloud_provider = "GCP"
+ plan = "BASIC"
+ serverless = {}
+ regions = [
+ {
+ name = "us-east1"
+ }
+ ]
+ delete_protection = false
+}
diff --git a/examples/workflows/cockroach_dedicated_cluster/main.tf b/examples/workflows/cockroach_advanced_cluster/main.tf
similarity index 99%
rename from examples/workflows/cockroach_dedicated_cluster/main.tf
rename to examples/workflows/cockroach_advanced_cluster/main.tf
index 5e2a8277..31f04d98 100644
--- a/examples/workflows/cockroach_dedicated_cluster/main.tf
+++ b/examples/workflows/cockroach_advanced_cluster/main.tf
@@ -93,6 +93,7 @@ provider "cockroach" {
resource "cockroach_cluster" "example" {
name = var.cluster_name
cloud_provider = var.cloud_provider
+ plan = "ADVANCED"
dedicated = {
storage_gib = var.storage_gib
num_virtual_cpus = var.num_virtual_cpus
diff --git a/examples/workflows/cockroach_serverless_cluster/main.tf b/examples/workflows/cockroach_basic_cluster/main.tf
similarity index 90%
rename from examples/workflows/cockroach_serverless_cluster/main.tf
rename to examples/workflows/cockroach_basic_cluster/main.tf
index 0667b438..c6295988 100644
--- a/examples/workflows/cockroach_serverless_cluster/main.tf
+++ b/examples/workflows/cockroach_basic_cluster/main.tf
@@ -19,12 +19,6 @@ variable "sql_user_password" {
sensitive = true
}
-variable "serverless_spend_limit" {
- type = number
- nullable = false
- default = 0
-}
-
variable "cloud_provider" {
type = string
nullable = false
@@ -51,10 +45,9 @@ provider "cockroach" {
resource "cockroach_cluster" "example" {
name = var.cluster_name
cloud_provider = var.cloud_provider
- serverless = {
- spend_limit = var.serverless_spend_limit
- }
- regions = [for r in var.cloud_provider_regions : { name = r }]
+ plan = "BASIC"
+ serverless = {}
+ regions = [for r in var.cloud_provider_regions : { name = r }]
}
resource "cockroach_sql_user" "example" {
diff --git a/examples/workflows/cockroach_client_ca_cert/main.tf b/examples/workflows/cockroach_client_ca_cert/main.tf
index add8344c..9835f095 100644
--- a/examples/workflows/cockroach_client_ca_cert/main.tf
+++ b/examples/workflows/cockroach_client_ca_cert/main.tf
@@ -30,7 +30,7 @@ variable "storage_gib" {
variable "machine_type" {
type = string
nullable = false
- default = "n1-standard-2"
+ default = "n2-standard-2"
}
terraform {
diff --git a/examples/workflows/cockroach_folder/main.tf b/examples/workflows/cockroach_folder/main.tf
index d307a561..7caa39f6 100644
--- a/examples/workflows/cockroach_folder/main.tf
+++ b/examples/workflows/cockroach_folder/main.tf
@@ -13,10 +13,10 @@ variable "cluster_name" {
nullable = false
}
-variable "serverless_spend_limit" {
+variable "provisioned_virtual_cpus" {
type = number
nullable = false
- default = 0
+ default = 2
}
variable "cloud_provider" {
@@ -73,8 +73,11 @@ resource "cockroach_user_role_grant" "cluster_creator_grant" {
resource "cockroach_cluster" "example" {
name = var.cluster_name
cloud_provider = var.cloud_provider
+ plan = "STANDARD"
serverless = {
- spend_limit = var.serverless_spend_limit
+ usage_limits = {
+ provisioned_virtual_cpus = var.provisioned_virtual_cpus
+ }
}
regions = [for r in var.cloud_provider_regions : { name = r }]
parent_id = cockroach_folder.example_folder_parent.id
diff --git a/examples/workflows/cockroach_log_export_config/gcp_cockroach_log_export_config/main.tf b/examples/workflows/cockroach_log_export_config/gcp_cockroach_log_export_config/main.tf
index e30a3bff..44a9cc58 100644
--- a/examples/workflows/cockroach_log_export_config/gcp_cockroach_log_export_config/main.tf
+++ b/examples/workflows/cockroach_log_export_config/gcp_cockroach_log_export_config/main.tf
@@ -29,7 +29,7 @@ variable "storage_gib" {
variable "machine_type" {
type = string
nullable = false
- default = "n1-standard-2"
+ default = "n2-standard-2"
}
variable "iam_role_id" {
diff --git a/examples/workflows/cockroach_metric_export/gcp/main.tf b/examples/workflows/cockroach_metric_export/gcp/main.tf
index 3b54fbf6..2f717427 100644
--- a/examples/workflows/cockroach_metric_export/gcp/main.tf
+++ b/examples/workflows/cockroach_metric_export/gcp/main.tf
@@ -18,7 +18,7 @@ variable "storage_gib" {
variable "machine_type" {
type = string
nullable = false
- default = "n1-standard-2"
+ default = "n2-standard-2"
}
variable "gcp_region" {
diff --git a/examples/workflows/cockroach_standard_cluster/main.tf b/examples/workflows/cockroach_standard_cluster/main.tf
new file mode 100644
index 00000000..8392ac1e
--- /dev/null
+++ b/examples/workflows/cockroach_standard_cluster/main.tf
@@ -0,0 +1,104 @@
+variable "cluster_name" {
+ type = string
+ nullable = false
+}
+
+variable "sql_user_name" {
+ type = string
+ nullable = false
+ default = "maxroach"
+}
+
+# Remember that even variables marked sensitive will show up
+# in the Terraform state file. Always follow best practices
+# when managing sensitive info.
+# https://developer.hashicorp.com/terraform/tutorials/configuration-language/sensitive-variables#sensitive-values-in-state
+variable "sql_user_password" {
+ type = string
+ nullable = false
+ sensitive = true
+}
+
+variable "provisioned_virtual_cpus" {
+ type = number
+ nullable = false
+ default = 2
+}
+
+variable "cloud_provider" {
+ type = string
+ nullable = false
+ default = "GCP"
+}
+
+variable "cloud_provider_regions" {
+ type = list(string)
+ nullable = false
+ default = ["us-central1"]
+}
+
+variable "upgrade_type" {
+ type = string
+ nullable = false
+ default = "AUTOMATIC"
+}
+
+terraform {
+ required_providers {
+ cockroach = {
+ source = "cockroachdb/cockroach"
+ }
+ }
+}
+provider "cockroach" {
+ # export COCKROACH_API_KEY with the cockroach cloud API Key
+}
+
+resource "cockroach_cluster" "example" {
+ name = var.cluster_name
+ cloud_provider = var.cloud_provider
+ plan = "STANDARD"
+ serverless = {
+ usage_limits = {
+ provisioned_virtual_cpus = var.provisioned_virtual_cpus
+ }
+ upgrade_type = var.upgrade_type
+ }
+ regions = [for r in var.cloud_provider_regions : { name = r }]
+}
+
+resource "cockroach_sql_user" "example" {
+ name = var.sql_user_name
+ password = var.sql_user_password
+ cluster_id = cockroach_cluster.example.id
+}
+
+resource "cockroach_database" "example" {
+ name = "example-database"
+ cluster_id = cockroach_cluster.example.id
+}
+
+resource "cockroach_service_account" "example_scoped_sa" {
+ name = "example-scoped-service-account"
+ description = "A service account providing limited read access to single cluster."
+}
+
+resource "cockroach_user_role_grant" "example_limited_access_scoped_grant" {
+ user_id = cockroach_service_account.example_scoped_sa.id
+ role = {
+ role_name = "CLUSTER_OPERATOR_WRITER",
+ resource_type = "CLUSTER",
+ resource_id = cockroach_cluster.example.id
+ }
+}
+
+resource "cockroach_api_key" "example_cluster_op_key_v1" {
+ name = "example-cluster-operator-key-v1"
+ service_account_id = cockroach_service_account.example_scoped_sa.id
+}
+
+output "example_cluster_op_key_v1_secret" {
+ value = cockroach_api_key.example_cluster_op_key_v1.secret
+ description = "The api key for example_cluster_op_key_v1_secret"
+ sensitive = true
+}
diff --git a/examples/workflows/cockroach_user_role_grants/main.tf b/examples/workflows/cockroach_user_role_grants/main.tf
index 1a36255a..4c5c36cb 100644
--- a/examples/workflows/cockroach_user_role_grants/main.tf
+++ b/examples/workflows/cockroach_user_role_grants/main.tf
@@ -3,10 +3,10 @@ variable "cluster_name" {
nullable = false
}
-variable "serverless_spend_limit" {
+variable "provisioned_virtual_cpus" {
type = number
nullable = false
- default = 0
+ default = 2
}
variable "cloud_provider" {
@@ -47,8 +47,11 @@ provider "cockroach" {
resource "cockroach_cluster" "example" {
name = var.cluster_name
cloud_provider = var.cloud_provider
+ plan = "STANDARD"
serverless = {
- spend_limit = var.serverless_spend_limit
+ usage_limits = {
+ provisioned_virtual_cpus = var.provisioned_virtual_cpus
+ }
}
regions = [for r in var.cloud_provider_regions : { name = r }]
}
diff --git a/go.mod b/go.mod
index 3ddec521..0f2850dd 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
toolchain go1.21.0
require (
- github.com/cockroachdb/cockroach-cloud-sdk-go/v2 v2.0.1
+ github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0
github.com/golang/mock v1.6.0
github.com/google/uuid v1.4.0
github.com/hashicorp/go-retryablehttp v0.7.4
diff --git a/go.sum b/go.sum
index 935e14a0..c6319fa2 100644
--- a/go.sum
+++ b/go.sum
@@ -25,8 +25,8 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/cockroachdb/cockroach-cloud-sdk-go/v2 v2.0.1 h1:WiLPmzOwMGG6IH9l/pKAQJnyhGK1lrVF7YOEOfgSn1A=
-github.com/cockroachdb/cockroach-cloud-sdk-go/v2 v2.0.1/go.mod h1:ziNZ/ed8nof9vEt1LoLBGOGd7izHQz0OMzDbu5iMU0A=
+github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0 h1:jbHNiRzBlJK0bJktxFwu753wq3OpMCQlR3GWqSTpJlQ=
+github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0/go.mod h1:RBE/ZEYOGeIqnmUYgysc8hTXLLkgW05fkHWdsMeEu6Q=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/internal/provider/allowlist_resource.go b/internal/provider/allowlist_resource.go
index a318397d..e3fa4d59 100644
--- a/internal/provider/allowlist_resource.go
+++ b/internal/provider/allowlist_resource.go
@@ -23,7 +23,7 @@ import (
"regexp"
"strconv"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
diff --git a/internal/provider/allowlist_resource_test.go b/internal/provider/allowlist_resource_test.go
index 321eb3aa..0f48fa98 100644
--- a/internal/provider/allowlist_resource_test.go
+++ b/internal/provider/allowlist_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -57,9 +57,9 @@ func TestAccDedicatedAllowlistEntryResource(t *testing.T) {
testAllowlistEntryResource(t, clusterName, entry, newEntry, false /* useMock */, false /* isServerless */)
}
-// TestAccServerlessAllowlistEntryResource attempts to create, check, and destroy
-// a real serverless cluster and allowlist entry. It will be skipped if TF_ACC
-// isn't set.
+// TestAccServerlessAllowlistEntryResource attempts to create, check, and
+// destroy a real serverless cluster and allowlist entry. It will be skipped if
+// TF_ACC isn't set.
func TestAccServerlessAllowlistEntryResource(t *testing.T) {
t.Parallel()
clusterName := fmt.Sprintf("%s-networking-%s", tfTestPrefix, GenerateRandomString(2))
@@ -108,7 +108,6 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
os.Setenv(CockroachAPIKey, "fake")
}
- zeroSpendLimit := int32(0)
cases := []struct {
name string
entry client.AllowlistEntry
@@ -134,6 +133,7 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
NumVirtualCpus: 2,
},
},
+ Plan: "ADVANCED",
State: "CREATED",
Regions: []client.Region{
{
@@ -155,13 +155,13 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
- Plan: "SERVERLESS",
+ Plan: "BASIC",
CloudProvider: "GCP",
State: "CREATED",
Config: client.ClusterConfig{
Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &zeroSpendLimit,
- RoutingId: "routing-id",
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
},
Regions: []client.Region{
@@ -449,9 +449,7 @@ func getTestAllowlistEntryResourceConfigForServerless(
resource "cockroach_cluster" "serverless" {
name = "%s"
cloud_provider = "GCP"
- serverless = {
- spend_limit = 0
- }
+ serverless = {}
regions = [{
name = "us-central1"
}]
diff --git a/internal/provider/api_key_resource.go b/internal/provider/api_key_resource.go
index af216c06..a41d7e22 100644
--- a/internal/provider/api_key_resource.go
+++ b/internal/provider/api_key_resource.go
@@ -6,7 +6,7 @@ import (
"net/http"
"strings"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
diff --git a/internal/provider/api_key_resource_test.go b/internal/provider/api_key_resource_test.go
index 8b1bd1be..785bc198 100644
--- a/internal/provider/api_key_resource_test.go
+++ b/internal/provider/api_key_resource_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/api_oidc_config.go b/internal/provider/api_oidc_config.go
index 7424cc3d..a4146b2d 100644
--- a/internal/provider/api_oidc_config.go
+++ b/internal/provider/api_oidc_config.go
@@ -21,7 +21,7 @@ import (
"fmt"
"net/http"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/api_oidc_config_test.go b/internal/provider/api_oidc_config_test.go
index 48f31027..b8955820 100644
--- a/internal/provider/api_oidc_config_test.go
+++ b/internal/provider/api_oidc_config_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/client_ca_cert_resource.go b/internal/provider/client_ca_cert_resource.go
index 33a3b156..938715d6 100644
--- a/internal/provider/client_ca_cert_resource.go
+++ b/internal/provider/client_ca_cert_resource.go
@@ -22,7 +22,7 @@ import (
"net/http"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/client_ca_cert_resource_test.go b/internal/provider/client_ca_cert_resource_test.go
index 12ee71e9..e9cfd3e2 100644
--- a/internal/provider/client_ca_cert_resource_test.go
+++ b/internal/provider/client_ca_cert_resource_test.go
@@ -23,7 +23,7 @@ import (
"strings"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/cluster_cert_data_source.go b/internal/provider/cluster_cert_data_source.go
index b835d963..b2d8499b 100644
--- a/internal/provider/cluster_cert_data_source.go
+++ b/internal/provider/cluster_cert_data_source.go
@@ -23,7 +23,7 @@ import (
"net/http"
"os"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/diag"
diff --git a/internal/provider/cluster_cert_data_source_test.go b/internal/provider/cluster_cert_data_source_test.go
index 6255bb01..0dd38a43 100644
--- a/internal/provider/cluster_cert_data_source_test.go
+++ b/internal/provider/cluster_cert_data_source_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/cluster_data_source.go b/internal/provider/cluster_data_source.go
index 5f2acbb9..096249d4 100644
--- a/internal/provider/cluster_data_source.go
+++ b/internal/provider/cluster_data_source.go
@@ -21,7 +21,7 @@ import (
"fmt"
"net/http"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
)
@@ -49,7 +49,7 @@ func (d *clusterDataSource) Schema(
},
"plan": schema.StringAttribute{
Computed: true,
- Description: "Denotes cluster deployment type: 'DEDICATED' or 'SERVERLESS'.",
+ Description: "Denotes cluster plan type: 'BASIC' or 'STANDARD' or 'ADVANCED'.",
},
"cloud_provider": schema.StringAttribute{
Computed: true,
@@ -64,6 +64,7 @@ func (d *clusterDataSource) Schema(
Computed: true,
Attributes: map[string]schema.Attribute{
"spend_limit": schema.Int64Attribute{
+ DeprecationMessage: "The `spend_limit` attribute is deprecated and will be removed in a future release of the provider. Configure 'usage_limits' instead.",
Computed: true,
MarkdownDescription: "Spend limit in US cents.",
},
@@ -78,12 +79,20 @@ func (d *clusterDataSource) Schema(
Computed: true,
MarkdownDescription: "Maximum amount of storage (in MiB) that the cluster can have at any time during the month.",
},
+ "provisioned_virtual_cpus": schema.Int64Attribute{
+ Computed: true,
+ MarkdownDescription: "Maximum number of vCPUs that the cluster can use.",
+ },
},
},
"routing_id": schema.StringAttribute{
Computed: true,
Description: "Cluster identifier in a connection string.",
},
+ "upgrade_type": schema.StringAttribute{
+ Computed: true,
+ Description: "Dictates the behavior of cockroach major version upgrades.",
+ },
},
},
"dedicated": schema.SingleNestedAttribute{
@@ -201,8 +210,8 @@ func (d *clusterDataSource) Read(
return
}
- var cluster CockroachCluster
- diags := req.Config.Get(ctx, &cluster)
+ var state CockroachCluster
+ diags := req.Config.Get(ctx, &state)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
@@ -210,14 +219,14 @@ func (d *clusterDataSource) Read(
return
}
- if cluster.ID.IsNull() {
+ if state.ID.IsNull() {
resp.Diagnostics.AddError(
"ID can't be null",
"The ID field is null, but it never should be. Please double check the value!",
)
return
}
- clusterID := cluster.ID.ValueString()
+ clusterID := state.ID.ValueString()
if !uuidRegex.MatchString(clusterID) {
resp.Diagnostics.AddError(
"Unexpected cluster ID format",
@@ -243,9 +252,9 @@ func (d *clusterDataSource) Read(
// The concept of a plan doesn't apply to data sources.
// Using a nil plan means we won't try to re-sort the region list.
- loadClusterToTerraformState(cockroachCluster, &cluster, nil)
-
- diags = resp.State.Set(ctx, cluster)
+ var newState CockroachCluster
+ loadClusterToTerraformState(cockroachCluster, &newState, nil)
+ diags = resp.State.Set(ctx, newState)
resp.Diagnostics.Append(diags...)
}
diff --git a/internal/provider/cluster_resource.go b/internal/provider/cluster_resource.go
index 20d1f21d..68f3b3c5 100644
--- a/internal/provider/cluster_resource.go
+++ b/internal/provider/cluster_resource.go
@@ -25,9 +25,10 @@ import (
"strings"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/cockroachdb/terraform-provider-cockroach/internal/validators"
"github.com/hashicorp/terraform-plugin-framework-validators/resourcevalidator"
+ "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -55,6 +56,14 @@ type clusterResource struct {
provider *provider
}
+var AllowedUpgradeTypeTypeEnumValueStrings = func() []string {
+ var strings []string
+ for i := range client.AllowedUpgradeTypeTypeEnumValues {
+ strings = append(strings, string(client.AllowedUpgradeTypeTypeEnumValues[i]))
+ }
+ return strings
+}()
+
var regionSchema = schema.NestedAttributeObject{
Attributes: map[string]schema.Attribute{
"name": schema.StringAttribute{
@@ -84,7 +93,7 @@ var regionSchema = schema.NestedAttributeObject{
"primary": schema.BoolAttribute{
Optional: true,
Computed: true,
- Description: "Set to true to mark this region as the primary for a Serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.",
+ Description: "Set to true to mark this region as the primary for a serverless cluster. Exactly one region must be primary. Dedicated clusters expect to have no primary region.",
},
},
}
@@ -93,7 +102,7 @@ func (r *clusterResource) Schema(
_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse,
) {
resp.Schema = schema.Schema{
- Description: "CockroachDB Cloud cluster. Can be Dedicated or Serverless.",
+ Description: "CockroachDB Cloud cluster.",
Attributes: map[string]schema.Attribute{
"id": schema.StringAttribute{
Computed: true,
@@ -122,10 +131,12 @@ func (r *clusterResource) Schema(
},
"plan": schema.StringAttribute{
Computed: true,
+ Optional: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
- Description: "Denotes cluster deployment type: 'DEDICATED' or 'SERVERLESS'.",
+ Validators: []validator.String{stringvalidator.OneOf("BASIC", "STANDARD", "ADVANCED")},
+ Description: "Denotes cluster plan type: 'BASIC' or 'STANDARD' or 'ADVANCED'.",
},
"cloud_provider": schema.StringAttribute{
Required: true,
@@ -139,6 +150,7 @@ func (r *clusterResource) Schema(
},
Attributes: map[string]schema.Attribute{
"spend_limit": schema.Int64Attribute{
+ DeprecationMessage: "The `spend_limit` attribute is deprecated and will be removed in a future release of the provider. Configure 'usage_limits' instead.",
Optional: true,
MarkdownDescription: "Spend limit in US cents.",
},
@@ -146,19 +158,26 @@ func (r *clusterResource) Schema(
Optional: true,
Attributes: map[string]schema.Attribute{
"request_unit_limit": schema.Int64Attribute{
- Required: true,
+ Optional: true,
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
MarkdownDescription: "Maximum number of Request Units that the cluster can consume during the month.",
},
"storage_mib_limit": schema.Int64Attribute{
- Required: true,
+ Optional: true,
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
MarkdownDescription: "Maximum amount of storage (in MiB) that the cluster can have at any time during the month.",
},
+ "provisioned_virtual_cpus": schema.Int64Attribute{
+ Optional: true,
+ PlanModifiers: []planmodifier.Int64{
+ int64planmodifier.UseStateForUnknown(),
+ },
+ MarkdownDescription: "Maximum number of vCPUs that the cluster can use.",
+ },
},
},
"routing_id": schema.StringAttribute{
@@ -168,6 +187,16 @@ func (r *clusterResource) Schema(
},
Description: "Cluster identifier in a connection string.",
},
+ "upgrade_type": schema.StringAttribute{
+ Computed: true,
+ Optional: true,
+ PlanModifiers: []planmodifier.String{
+ stringplanmodifier.UseStateForUnknown(),
+ },
+ Validators: []validator.String{stringvalidator.OneOf(AllowedUpgradeTypeTypeEnumValueStrings...)},
+ MarkdownDescription: "Dictates the behavior of cockroach major version upgrades. If plan type is 'BASIC', this attribute must be left empty or set to 'AUTOMATIC'. Allowed values are: " +
+ formatEnumMarkdownList(AllowedUpgradeTypeTypeEnumValueStrings),
+ },
},
},
"dedicated": schema.SingleNestedAttribute{
@@ -290,8 +319,12 @@ func (r *clusterResource) ConfigValidators(_ context.Context) []resource.ConfigV
path.MatchRoot("serverless").AtName("usage_limits"),
),
resourcevalidator.Conflicting(
- path.MatchRoot("regions").AtAnyListIndex().AtName("primary"),
- path.MatchRoot("dedicated"),
+ path.MatchRoot("serverless").AtName("usage_limits").AtName("request_unit_limit"),
+ path.MatchRoot("serverless").AtName("usage_limits").AtName("provisioned_virtual_cpus"),
+ ),
+ resourcevalidator.Conflicting(
+ path.MatchRoot("serverless").AtName("usage_limits").AtName("storage_mib_limit"),
+ path.MatchRoot("serverless").AtName("usage_limits").AtName("provisioned_virtual_cpus"),
),
}
}
@@ -305,16 +338,18 @@ func (r *clusterResource) Create(
}
var plan CockroachCluster
-
diags := req.Plan.Get(ctx, &plan)
resp.Diagnostics.Append(diags...)
-
if resp.Diagnostics.HasError() {
return
}
clusterSpec := client.NewCreateClusterSpecification()
+ if IsKnown(plan.Plan) {
+ clusterSpec.SetPlan(client.PlanType(plan.Plan.ValueString()))
+ }
+
if plan.ServerlessConfig != nil {
var regions []string
var primaryRegion string
@@ -322,7 +357,7 @@ func (r *clusterResource) Create(
if region.Primary.ValueBool() {
if primaryRegion != "" {
resp.Diagnostics.AddError("Too many primary regions",
- "Only one region may be marked primary when creating a multi-region Serverless cluster.")
+ "Only one region may be marked primary when creating a multi-region serverless cluster.")
return
}
primaryRegion = region.Name.ValueString()
@@ -331,22 +366,28 @@ func (r *clusterResource) Create(
}
if len(regions) > 1 && primaryRegion == "" {
resp.Diagnostics.AddError("Primary region missing",
- "One region must be marked primary when creating a multi-region Serverless cluster.")
+ "One region must be marked primary when creating a multi-region serverless cluster.")
}
serverless := client.NewServerlessClusterCreateSpecification(regions)
if primaryRegion != "" {
serverless.PrimaryRegion = &primaryRegion
}
- usageLimits := plan.ServerlessConfig.UsageLimits
+ usageLimits := r.getUsageLimits(plan.ServerlessConfig)
if usageLimits != nil {
- serverless.UsageLimits = client.NewUsageLimits(
- usageLimits.RequestUnitLimit.ValueInt64(), usageLimits.StorageMibLimit.ValueInt64())
- } else {
- spendLimit := plan.ServerlessConfig.SpendLimit
- if IsKnown(spendLimit) {
- val := int32(spendLimit.ValueInt64())
- serverless.SpendLimit = &val
+ serverless.UsageLimits = client.NewUsageLimits()
+ serverless.UsageLimits.RequestUnitLimit = usageLimits.RequestUnitLimit.ValueInt64Pointer()
+ serverless.UsageLimits.StorageMibLimit = usageLimits.StorageMibLimit.ValueInt64Pointer()
+ serverless.UsageLimits.ProvisionedVirtualCpus = usageLimits.ProvisionedVirtualCpus.ValueInt64Pointer()
+ }
+
+ upgradeTypeString := plan.ServerlessConfig.UpgradeType.ValueString()
+ if upgradeTypeString != "" {
+ upgradeType, err := client.NewUpgradeTypeTypeFromValue(upgradeTypeString)
+ if err != nil {
+ resp.Diagnostics.AddError("Invalid Upgrade Type", err.Error())
+ } else {
+ serverless.SetUpgradeType(*upgradeType)
}
}
@@ -361,6 +402,10 @@ func (r *clusterResource) Create(
regionNodes := make(map[string]int32, len(plan.Regions))
for _, region := range plan.Regions {
regionNodes[region.Name.ValueString()] = int32(region.NodeCount.ValueInt64())
+ if IsKnown(region.Primary) {
+ resp.Diagnostics.AddError("Invalid Attribute Combination",
+ "Dedicated clusters do not support the primary attribute on regions.")
+ }
}
dedicated.RegionNodes = regionNodes
}
@@ -395,7 +440,7 @@ func (r *clusterResource) Create(
return
}
- if !(plan.ParentId.IsNull() || plan.ParentId.IsUnknown()) {
+ if IsKnown(plan.ParentId) {
parentID := plan.ParentId.ValueString()
if parentID != "root" {
traceAPICall("GetFolder")
@@ -437,9 +482,9 @@ func (r *clusterResource) Create(
return
}
- var state CockroachCluster
- loadClusterToTerraformState(clusterObj, &state, &plan)
- diags = resp.State.Set(ctx, state)
+ var newState CockroachCluster
+ loadClusterToTerraformState(clusterObj, &newState, &plan)
+ diags = resp.State.Set(ctx, newState)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
@@ -454,18 +499,18 @@ func (r *clusterResource) Read(
return
}
- var cluster CockroachCluster
- diags := req.State.Get(ctx, &cluster)
+ var state CockroachCluster
+ diags := req.State.Get(ctx, &state)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
- if !IsKnown(cluster.ID) {
+ if !IsKnown(state.ID) {
return
}
- clusterID := cluster.ID.ValueString()
+ clusterID := state.ID.ValueString()
// In case this was an import, validate the ID format.
if !uuidRegex.MatchString(clusterID) {
resp.Diagnostics.AddError(
@@ -499,16 +544,15 @@ func (r *clusterResource) Read(
return
}
- // We actually want to use the current state as the plan here,
- // since we're trying to see if it changed.
- loadClusterToTerraformState(clusterObj, &cluster, &cluster)
-
- diags = resp.State.Set(ctx, cluster)
+ // We actually want to use the current state as the plan here, since we're
+ // trying to see if it changed.
+ var newState CockroachCluster
+ loadClusterToTerraformState(clusterObj, &newState, &state)
+ diags = resp.State.Set(ctx, newState)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
-
}
// ModifyPlan is used to make sure the user isn't trying to modify an
@@ -572,6 +616,34 @@ func (r *clusterResource) ModifyPlan(
}
}
+// getUsageLimits tries to derive usage limits from the given Serverless config.
+// If it already specifies limits, they are returned. If there is a spend limit,
+// it is translated into usage limits. Otherwise, nil is returned.
+func (r *clusterResource) getUsageLimits(config *ServerlessClusterConfig) *UsageLimits {
+ const (
+ // requestUnitsPerUSD is the number of request units that one dollar buys,
+ // using May 1st prices for the original Serverless offering.
+ requestUnitsPerUSD = 5_000_000
+ // storageMiBMonthsPerUSD is the number of MiB that can be stored per month
+ // for one dollar, using May 1st prices for the original Serverless offering.
+ storageMiBMonthsPerUSD = 2 * 1024
+ )
+
+ if config.UsageLimits != nil {
+ return config.UsageLimits
+ }
+
+ if !config.SpendLimit.IsNull() {
+ spendLimit := config.SpendLimit.ValueInt64()
+ return &UsageLimits{
+ RequestUnitLimit: types.Int64Value(spendLimit * requestUnitsPerUSD * 8 / 10 / 100),
+ StorageMibLimit: types.Int64Value(spendLimit * storageMiBMonthsPerUSD * 2 / 10 / 100),
+ }
+ }
+
+ return nil
+}
+
// Comparator for two CRDB versions to make validation simpler. Assumes biannual releases of the form vYY.H.
// Result is the number of releases apart, negative if r is later and positive is l is later. For example,
// compareCrdbVersions("v22.1", "v22.2") = -1, compareCrdbVersions("v22.1", "v19.2") = 3
@@ -689,7 +761,7 @@ func (r *clusterResource) Update(
if region.Primary.ValueBool() {
if primaryRegion != "" {
resp.Diagnostics.AddError("Too many primary regions",
- "Only one region may be marked primary when creating a multi-region Serverless cluster.")
+ "Only one region may be marked primary when creating a multi-region serverless cluster.")
return
}
primaryRegion = region.Name.ValueString()
@@ -698,28 +770,46 @@ func (r *clusterResource) Update(
}
if len(regions) > 1 && primaryRegion == "" {
resp.Diagnostics.AddError("Primary region missing",
- "One region must be marked primary when updating a multi-region Serverless cluster.")
+ "One region must be marked primary when updating a multi-region serverless cluster.")
return
}
serverless.SetPrimaryRegion(primaryRegion)
serverless.SetRegions(regions)
}
- // Set either usage limits or spend limit.
- usageLimits := plan.ServerlessConfig.UsageLimits
+ // If usage limits are nil in the plan, send empty usage limits to the
+ // API server so that it will clear limits (i.e. "unlimited" case).
+ serverless.UsageLimits = client.NewUsageLimits()
+ usageLimits := r.getUsageLimits(plan.ServerlessConfig)
if usageLimits != nil {
- serverless.UsageLimits = client.NewUsageLimits(
- usageLimits.RequestUnitLimit.ValueInt64(), usageLimits.StorageMibLimit.ValueInt64())
- } else {
- // Always set a spend limit. If it's unknown/null, still set it to
- // zero so that the server will clear limits.
- // TODO(andyk): Update this code once there is a better way of telling
- // the server to clear limits. Today, the Go SDK cannot distinguish
- // between null values that mean "clear limits" and null values that
- // mean "ignore these fields".
- val := int32(plan.ServerlessConfig.SpendLimit.ValueInt64())
- serverless.SpendLimit = &val
+ serverless.UsageLimits.RequestUnitLimit = usageLimits.RequestUnitLimit.ValueInt64Pointer()
+ serverless.UsageLimits.StorageMibLimit = usageLimits.StorageMibLimit.ValueInt64Pointer()
+ serverless.UsageLimits.ProvisionedVirtualCpus = usageLimits.ProvisionedVirtualCpus.ValueInt64Pointer()
+ }
+
+ planUpgradeType := plan.ServerlessConfig.UpgradeType.ValueString()
+ stateUpgradeType := state.ServerlessConfig.UpgradeType.ValueString()
+
+ // Only add the upgrade_type if it changed.
+ if planUpgradeType != "" && planUpgradeType != stateUpgradeType {
+
+ upgradeTypePtr, err := client.NewUpgradeTypeTypeFromValue(plan.ServerlessConfig.UpgradeType.ValueString())
+ if err != nil {
+ resp.Diagnostics.AddError("Invalid value for upgrade_type", err.Error())
+ return
+ }
+ upgradeType := *upgradeTypePtr
+
+ // Check this combination explicitly to provide a better message
+ // than the ccapi is currently returning for this case.
+ if plan.Plan.ValueString() == string(client.PLANTYPE_BASIC) && upgradeType == client.UPGRADETYPETYPE_MANUAL {
+ resp.Diagnostics.AddError("Invalid value for upgrade_type", "plan type BASIC does not allow upgrade_type MANUAL")
+ return
+ }
+
+ serverless.SetUpgradeType(upgradeType)
}
+
clusterReq.SetServerless(*serverless)
} else if cfg := plan.DedicatedConfig; cfg != nil {
dedicated := client.NewDedicatedClusterUpdateSpecification()
@@ -753,7 +843,7 @@ func (r *clusterResource) Update(
}
// Parent Id
- if !(plan.ParentId.IsNull() || plan.ParentId.IsUnknown()) {
+ if IsKnown(plan.ParentId) {
parentID := plan.ParentId.ValueString()
if parentID != "root" {
traceAPICall("GetFolder")
@@ -779,6 +869,11 @@ func (r *clusterResource) Update(
clusterReq.SetDeleteProtection(deleteProtection)
}
+ // Plan
+ if IsKnown(plan.Plan) {
+ clusterReq.SetPlan(client.PlanType(plan.Plan.ValueString()))
+ }
+
traceAPICall("UpdateCluster")
clusterObj, _, err := r.provider.service.UpdateCluster(ctx, state.ID.ValueString(), clusterReq)
if err != nil {
@@ -799,9 +894,10 @@ func (r *clusterResource) Update(
return
}
- // Set state
- loadClusterToTerraformState(clusterObj, &state, &plan)
- diags = resp.State.Set(ctx, state)
+ // Set state.
+ var newState CockroachCluster
+ loadClusterToTerraformState(clusterObj, &newState, &plan)
+ diags = resp.State.Set(ctx, newState)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
@@ -892,7 +988,7 @@ func sortRegionsByPlan(regions *[]client.Region, plan []Region) {
})
}
-// loadCLusterToTerraformState translates the cluster from an API response into the
+// loadClusterToTerraformState translates the cluster from an API response into the
// TF provider model. It's used in both the cluster resource and data source. The plan,
// if available, is used to determine the sort order of the cluster's regions, as well as
// special formatting of certain attribute values (e.g. "preview" for `cockroach_version`).
@@ -937,26 +1033,28 @@ func loadClusterToTerraformState(
if clusterObj.Config.Serverless != nil {
serverlessConfig := &ServerlessClusterConfig{
RoutingId: types.StringValue(clusterObj.Config.Serverless.RoutingId),
+ UpgradeType: types.StringValue(string(clusterObj.Config.Serverless.UpgradeType)),
}
- // The whole plan or just its serverless config can be nil.
- var planConfig *ServerlessClusterConfig
- if plan != nil {
- planConfig = plan.ServerlessConfig
- }
-
- // Set either the spend limit or usage limits, depending on the plan.
- // Both options are returned by the API. If there's no plan (import or
- // data source), we default to usage limits.
- if clusterObj.Config.Serverless.UsageLimits != nil && (planConfig == nil || planConfig.UsageLimits != nil) {
+ if plan != nil && plan.ServerlessConfig != nil && IsKnown(plan.ServerlessConfig.SpendLimit) {
+ // Map back to the spend limit if it was specified in the plan.
+ serverlessConfig.SpendLimit = plan.ServerlessConfig.SpendLimit
+ } else {
usageLimits := clusterObj.Config.Serverless.UsageLimits
- serverlessConfig.UsageLimits = &UsageLimits{
- RequestUnitLimit: types.Int64Value(usageLimits.RequestUnitLimit),
- StorageMibLimit: types.Int64Value(usageLimits.StorageMibLimit),
+ if usageLimits != nil {
+ serverlessConfig.UsageLimits = &UsageLimits{
+ ProvisionedVirtualCpus: types.Int64PointerValue(usageLimits.ProvisionedVirtualCpus),
+ RequestUnitLimit: types.Int64PointerValue(usageLimits.RequestUnitLimit),
+ StorageMibLimit: types.Int64PointerValue(usageLimits.StorageMibLimit),
+ }
+ } else if plan != nil && plan.ServerlessConfig != nil && plan.ServerlessConfig.UsageLimits != nil {
+ // There is no difference in behavior between UsageLimits = nil and
+ // UsageLimits = &UsageLimits{}, but we need to match whichever form
+ // the plan requested.
+ serverlessConfig.UsageLimits = &UsageLimits{}
}
- } else if clusterObj.Config.Serverless.SpendLimit != nil && planConfig != nil && IsKnown(planConfig.SpendLimit) {
- serverlessConfig.SpendLimit = types.Int64Value(int64(clusterObj.Config.Serverless.GetSpendLimit()))
}
+
state.ServerlessConfig = serverlessConfig
} else if clusterObj.Config.Dedicated != nil {
state.DedicatedConfig = &DedicatedClusterConfig{
diff --git a/internal/provider/cluster_resource_test.go b/internal/provider/cluster_resource_test.go
index 2c9a8c7a..58548f54 100644
--- a/internal/provider/cluster_resource_test.go
+++ b/internal/provider/cluster_resource_test.go
@@ -23,9 +23,11 @@ import (
"net/http"
"os"
"regexp"
+ "strconv"
+ "strings"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -45,10 +47,15 @@ const (
minSupportedClusterPatchVersion = "v23.2.0"
latestClusterMajorVersion = "v24.1"
latestClusterPatchVersion = "v24.1.0"
+
+ serverlessResourceName = "cockroach_cluster.test"
+ serverlessDataSourceName = "data.cockroach_cluster.test"
+
+ defaultPlanType = ""
)
-// TestAccClusterResource attempts to create, check, update, and destroy
-// a real cluster. It will be skipped if TF_ACC isn't set.
+// TestAccServerlessClusterResource attempts to create, check, update, and
+// destroy a real cluster. It will be skipped if TF_ACC isn't set.
func TestAccServerlessClusterResource(t *testing.T) {
t.Parallel()
clusterName := fmt.Sprintf("%s-serverless-%s", tfTestPrefix, GenerateRandomString(2))
@@ -57,16 +64,101 @@ func TestAccServerlessClusterResource(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
- serverlessClusterWithSpendLimit(clusterName),
- serverlessClusterWithResourceLimits(clusterName),
- serverlessClusterWithNoLimits(clusterName),
- serverlessClusterWithZeroSpendLimit(clusterName),
+ onDemandSingleRegionClusterWithLimitsStep(clusterName, defaultPlanType, 10_000_000_000, 102_400),
+ onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 1_000_000, 1024),
+ onDemandSingleRegionClusterNoLimitsStep(clusterName, defaultPlanType),
+ onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 10_000_000_000, 102_400),
+ onDemandSingleRegionClusterWithUnlimitedStep(clusterName, defaultPlanType, nil /* upgradeType */),
+ onDemandSingleRegionClusterNoLimitsStep(clusterName, "BASIC"),
+ legacyServerlessClusterWithSpendLimitStep(clusterName, 10_00),
+ onDemandSingleRegionClusterWithUnlimitedStep(clusterName, defaultPlanType, nil /* upgradeType */),
+ // Upgrade to STANDARD.
+ provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, nil),
+ // Downgrade to BASIC.
+ onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", nil /* upgradeType */),
+ },
+ })
+}
+
+// TestAccServerlessUpgradeType is an acceptance test focused only on testing
+// upgrade_type. Since the serverless tests are relatively quick, no
+// integration test version of this is added. It will be skipped if TF_ACC
+// isn't set.
+func TestAccServerlessUpgradeType(t *testing.T) {
+ t.Parallel()
+ clusterName := fmt.Sprintf("%s-serverless-%s", tfTestPrefix, GenerateRandomString(2))
+ checkUpgradeTypeResources := func(upgradeType client.UpgradeTypeType) resource.TestCheckFunc {
+ return resource.ComposeTestCheckFunc(
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.upgrade_type", string(upgradeType)),
+ resource.TestCheckResourceAttr(serverlessDataSourceName , "serverless.upgrade_type", string(upgradeType)),
+ )
+ }
+ resource.Test(t, resource.TestCase{
+ IsUnitTest: false,
+ PreCheck: func() { testAccPreCheck(t) },
+ ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+ Steps: []resource.TestStep{
+ // Create a provisioned cluster with the default value for upgrade_type
+ {
+ Config: provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, nil).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Explicitly updating the value to MANUAL performs the update
+ {
+ Config: provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, ptr(client.UPGRADETYPETYPE_MANUAL)).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_MANUAL),
+ },
+ // Removal of the optional value from the config makes no change
+ {
+ Config: provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, nil).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_MANUAL),
+ },
+ // Change it back to automatic so we can downgrade the cluster to
+ // BASIC. Currently the ccapi doesn't allow downgrading to BASIC
+ // unless upgrade_type is AUTOMATIC already.
+ {
+ Config: provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, ptr(client.UPGRADETYPETYPE_AUTOMATIC)).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Downgrade to Basic, the upgrade_type remains AUTOMATIC
+ {
+ Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", nil /* upgradeType */).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Setting the value to MANUAL is not allowed for Basic
+ {
+ Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UPGRADETYPETYPE_MANUAL)).Config,
+ ExpectError: regexp.MustCompile("plan type BASIC does not allow upgrade_type MANUAL"),
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Setting completely invalid value for upgrade_type
+ {
+ Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UpgradeTypeType("hi"))).Config,
+ ExpectError: regexp.MustCompile("Attribute serverless.upgrade_type value must be one of"),
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Basic clusters can also accept a value of AUTOMATIC.
+ {
+ Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UPGRADETYPETYPE_AUTOMATIC)).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
+ // Destroy the cluster so we can create it again in the next step
+ {
+ Config: " ",
+ Destroy: true,
+ },
+ // Basic clusters can also be created with a value of AUTOMATIC
+ {
+ Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UPGRADETYPETYPE_AUTOMATIC)).Config,
+ Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC),
+ },
},
})
}
-// TestAccMultiRegionServerlessClusterResource attempts to create, update, check, and destroy
-// a real multi-region serverless cluster. It will be skipped if TF_ACC isn't set.
+// TestAccMultiRegionServerlessClusterResource attempts to create, update, check,
+// and destroy a real multi-region serverless cluster. It will be skipped if
+// TF_ACC isn't set.
func TestAccMultiRegionServerlessClusterResource(t *testing.T) {
t.Parallel()
clusterName := fmt.Sprintf("%s-multi-region-serverless-%s", tfTestPrefix, GenerateRandomString(2))
@@ -75,158 +167,419 @@ func TestAccMultiRegionServerlessClusterResource(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
- multiRegionServerlessClusterResource(clusterName),
- multiRegionServerlessClusterResourceRegionUpdate(clusterName),
+ provisionedMultiRegionClusterWithLimitStep(clusterName, "STANDARD"),
+ provisionedMultiRegionClusterUpdatedStep(clusterName, defaultPlanType),
},
})
}
-// TestIntegrationServerlessClusterResource attempts to create, check, and destroy
-// a cluster, but uses a mocked API service.
+// TestIntegrationServerlessClusterResource attempts to create, check, and destroy a
+// cluster, but uses a mocked API service.
func TestIntegrationServerlessClusterResource(t *testing.T) {
if os.Getenv(CockroachAPIKey) == "" {
os.Setenv(CockroachAPIKey, "fake")
}
- spendLimit := int32(1)
- zeroSpendLimit := int32(0)
- true_val := true
- initialCluster := client.Cluster{
- Id: uuid.Nil.String(),
- Name: fmt.Sprintf("%s-serverless-%s", tfTestPrefix, GenerateRandomString(2)),
- CockroachVersion: latestClusterPatchVersion,
- Plan: "SERVERLESS",
- CloudProvider: "GCP",
- State: "CREATED",
- Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &spendLimit,
- UsageLimits: &client.UsageLimits{
- RequestUnitLimit: 1,
- StorageMibLimit: 1,
+
+ boolPtr := func(val bool) *bool { return &val }
+ int64Ptr := func(val int64) *int64 { return &val }
+ clusterName := fmt.Sprintf("%s-serverless-%s", tfTestPrefix, GenerateRandomString(2))
+
+ singleRegionClusterWithUnlimited := func(planType client.PlanType) client.Cluster {
+ return client.Cluster{
+ Id: uuid.Nil.String(),
+ Name: clusterName,
+ CockroachVersion: latestClusterPatchVersion,
+ CloudProvider: "GCP",
+ State: "CREATED",
+ Plan: planType,
+ Config: client.ClusterConfig{
+ Serverless: &client.ServerlessClusterConfig{
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
- RoutingId: "routing-id",
},
- },
- Regions: []client.Region{
- {
- Name: "us-central1",
+ Regions: []client.Region{
+ {
+ Name: "us-central1",
+ },
},
- },
+ }
}
- cases := []struct {
- name string
- finalCluster client.Cluster
- testStep func(clusterName string) resource.TestStep
- skipVerifyImport bool
- }{
- {
- "single-region serverless cluster with resource limits",
- client.Cluster{
- Id: uuid.Nil.String(),
- Name: initialCluster.Name,
- CockroachVersion: latestClusterPatchVersion,
- Plan: "SERVERLESS",
- CloudProvider: "GCP",
- State: "CREATED",
- Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- UsageLimits: &client.UsageLimits{
- RequestUnitLimit: 10_000_000_000,
- StorageMibLimit: 102_400,
- },
- RoutingId: "routing-id",
+ singleRegionClusterWithLimits := func(
+ planType client.PlanType,
+ ruLimit int64,
+ storageLimit int64,
+ ) client.Cluster {
+ return client.Cluster{
+ Id: uuid.Nil.String(),
+ Name: clusterName,
+ CockroachVersion: latestClusterPatchVersion,
+ CloudProvider: "GCP",
+ State: "CREATED",
+ Plan: planType,
+ Config: client.ClusterConfig{
+ Serverless: &client.ServerlessClusterConfig{
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
+ UsageLimits: &client.UsageLimits{
+ RequestUnitLimit: int64Ptr(ruLimit),
+ StorageMibLimit: int64Ptr(storageLimit),
},
+ RoutingId: "routing-id",
},
- Regions: []client.Region{
- {
- Name: "us-central1",
- },
+ },
+ Regions: []client.Region{
+ {
+ Name: "us-central1",
},
},
- serverlessClusterWithResourceLimits,
- false,
- },
- {
- "single-region serverless cluster with no limits",
- client.Cluster{
- Id: uuid.Nil.String(),
- Name: initialCluster.Name,
- CockroachVersion: latestClusterPatchVersion,
- Plan: "SERVERLESS",
- CloudProvider: "GCP",
- State: "CREATED",
- Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- RoutingId: "routing-id",
+ }
+ }
+
+ provisionedSingleRegionCluster := func(planType client.PlanType, provisionedVirtualCpus int64) client.Cluster {
+ return client.Cluster{
+ Id: uuid.Nil.String(),
+ Name: clusterName,
+ CockroachVersion: latestClusterPatchVersion,
+ CloudProvider: "GCP",
+ State: "CREATED",
+ Plan: "STANDARD",
+ Config: client.ClusterConfig{
+ Serverless: &client.ServerlessClusterConfig{
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
+ UsageLimits: &client.UsageLimits{
+ ProvisionedVirtualCpus: int64Ptr(provisionedVirtualCpus),
},
+ RoutingId: "routing-id",
},
- Regions: []client.Region{
- {
- Name: "us-central1",
- },
+ },
+ Regions: []client.Region{
+ {
+ Name: "us-central1",
},
},
- serverlessClusterWithNoLimits,
- false,
- },
- {
- "single-region serverless cluster with zero spend limit",
- client.Cluster{
- Id: uuid.Nil.String(),
- Name: initialCluster.Name,
- CockroachVersion: latestClusterPatchVersion,
- Plan: "SERVERLESS",
- CloudProvider: "GCP",
- State: "CREATED",
- Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &zeroSpendLimit,
- RoutingId: "routing-id",
+ }
+ }
+
+ provisionedMultiRegionCluster := func(provisionedVirtualCpus int64, primaryIndex int) client.Cluster {
+ cluster := client.Cluster{
+ Id: uuid.Nil.String(),
+ Name: clusterName,
+ CockroachVersion: latestClusterPatchVersion,
+ CloudProvider: "GCP",
+ State: "CREATED",
+ Plan: "STANDARD",
+ Config: client.ClusterConfig{
+ Serverless: &client.ServerlessClusterConfig{
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
+ UsageLimits: &client.UsageLimits{
+ ProvisionedVirtualCpus: int64Ptr(provisionedVirtualCpus),
},
+ RoutingId: "routing-id",
},
- Regions: []client.Region{
- {
- Name: "us-central1",
- },
+ },
+ Regions: []client.Region{
+ {
+ Name: "europe-west1",
+ },
+ {
+ Name: "us-east1",
+ },
+ {
+ Name: "us-west2",
},
},
- serverlessClusterWithZeroSpendLimit,
- // The plan specifies a spend limit, but import always uses usage limits.
- true,
+ }
+ cluster.Regions[primaryIndex].Primary = boolPtr(true)
+ return cluster
+ }
+
+ cases := []struct {
+ name string
+ createStep func() resource.TestStep
+ validateCreate func(req *client.CreateClusterRequest) error
+ initialCluster client.Cluster
+ updateStep func() resource.TestStep
+ validateUpdate func(spec *client.UpdateClusterSpecification) error
+ finalCluster client.Cluster
+ ignoreImportPaths []string
+ }{
+ {
+ name: "single-region serverless BASIC cluster converted to unlimited resources",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 1_000_000, 1024)
+ },
+ validateCreate: func(req *client.CreateClusterRequest) error {
+ // Ensure that provider passes the plan type to Create.
+ if req.Spec.Plan == nil || *req.Spec.Plan != client.PLANTYPE_BASIC {
+ return fmt.Errorf("unexpected plan type in create request: %v", req.Spec.Plan)
+ }
+ return nil
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 1_000_000, 1024),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", nil /* upgradeType */)
+ },
+ validateUpdate: func(spec *client.UpdateClusterSpecification) error {
+ // Ensure that provider passes the plan type to Update.
+ if spec.Plan == nil || *spec.Plan != client.PLANTYPE_BASIC {
+ return fmt.Errorf("unexpected plan type in update request: %v", spec.Plan)
+ }
+ return nil
+ },
+ finalCluster: singleRegionClusterWithUnlimited("BASIC"),
+ // When testing import, skip validating the usage limits, because the
+ // server returns usage_limits = null for "unlimited", whereas the
+ // TF state contains usage_limits = {}. This is a spurious failure,
+ // as the two formulations are equivalent.
+ ignoreImportPaths: []string{"serverless.usage_limits.%"},
},
{
- "multi-region serverless cluster",
- client.Cluster{
- Id: uuid.Nil.String(),
- Name: initialCluster.Name,
- CockroachVersion: latestClusterPatchVersion,
- Plan: "SERVERLESS",
- CloudProvider: "GCP",
- State: "CREATED",
- Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- UsageLimits: client.NewUsageLimits(10000000000, 102400),
- RoutingId: "routing-id",
- },
- },
- Regions: []client.Region{
- {
- Name: "us-west2",
- },
- {
- Name: "us-east1",
- Primary: &true_val,
- },
- {
- Name: "europe-west1",
- },
- },
+ name: "single-region serverless BASIC cluster converted to no limit resources",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, defaultPlanType, 1_000_000, 1024)
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 1_000_000, 1024),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, defaultPlanType)
+ },
+ finalCluster: singleRegionClusterWithUnlimited("BASIC"),
+ },
+ {
+ name: "single-region serverless BASIC cluster converted from unlimited resources",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithUnlimitedStep(clusterName, defaultPlanType, nil /* upgradeType */)
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 1_000_000, 1024)
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 1_000_000, 1024),
+ },
+ {
+ name: "single-region serverless BASIC cluster converted from no limit resources",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, "BASIC")
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, defaultPlanType, 1_000_000, 1024)
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 1_000_000, 1024),
+ },
+ {
+ name: "single-region serverless BASIC cluster with updated resource limits",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, defaultPlanType, 1_000_000, 1024)
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 1_000_000, 1024),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 10_000_000_000, 102_400)
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 10_000_000_000, 102_400),
+ },
+ {
+ name: "single-region serverless BASIC cluster upgraded to STANDARD",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithUnlimitedStep(clusterName, defaultPlanType, nil /* upgradeType */)
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ return provisionedSingleRegionClusterStep(clusterName, "STANDARD", 10, nil)
+ },
+ validateUpdate: func(spec *client.UpdateClusterSpecification) error {
+ // Ensure that provider passes the new plan type to Update.
+ if spec.Plan == nil || *spec.Plan != client.PLANTYPE_STANDARD {
+ return fmt.Errorf("unexpected plan type in update request: %v", spec.Plan)
+ }
+ return nil
+ },
+ finalCluster: provisionedSingleRegionCluster("STANDARD", 10),
+ },
+ {
+ name: "single-region serverless STANDARD cluster downgraded to BASIC",
+ createStep: func() resource.TestStep {
+ return provisionedSingleRegionClusterStep(clusterName, defaultPlanType, 10, nil)
+ },
+ initialCluster: provisionedSingleRegionCluster("STANDARD", 10),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 10_000_000_000, 102_400)
+ },
+ validateUpdate: func(spec *client.UpdateClusterSpecification) error {
+ // Ensure that provider passes the new plan type to Update.
+ if spec.Plan == nil || *spec.Plan != client.PLANTYPE_BASIC {
+ return fmt.Errorf("unexpected plan type in update request: %v", spec.Plan)
+ }
+ return nil
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 10_000_000_000, 102_400),
+ },
+ {
+ name: "multi-region serverless STANDARD cluster with provisioned limit",
+ createStep: func() resource.TestStep {
+ return provisionedMultiRegionClusterWithLimitStep(clusterName, defaultPlanType)
+ },
+ initialCluster: provisionedMultiRegionCluster(6, 1),
+ updateStep: func() resource.TestStep {
+ return provisionedMultiRegionClusterUpdatedStep(clusterName, "STANDARD")
+ },
+ finalCluster: provisionedMultiRegionCluster(8, 0),
+ },
+ {
+ name: "legacy serverless cluster from spend limit to higher spend limit",
+ createStep: func() resource.TestStep {
+ return legacyServerlessClusterWithSpendLimitStep(clusterName, 10_00)
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 40_000_000, 4096),
+ updateStep: func() resource.TestStep {
+ return legacyServerlessClusterWithSpendLimitStep(clusterName, 20_00)
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 80_000_000, 8192),
+ // When testing import, skip validating the configs, because the test
+ // framework compares what's returned by the server (resource limits)
+ // with what was previously in the TF state (spend limit).
+ ignoreImportPaths: []string{
+ "serverless.usage_limits.%",
+ "serverless.usage_limits.request_unit_limit",
+ "serverless.usage_limits.storage_mib_limit",
+ "serverless.spend_limit",
+ },
+ },
+ {
+ name: "update legacy Serverless cluster with spend limit to use resource limits",
+ createStep: func() resource.TestStep {
+ return legacyServerlessClusterWithSpendLimitStep(clusterName, 10_00)
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 40_000_000, 4096),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterWithLimitsStep(clusterName, "BASIC", 80_000_000, 8192)
+ },
+ finalCluster: singleRegionClusterWithLimits("BASIC", 80_000_000, 8192),
+ },
+ {
+ name: "clear spend limit in legacy Serverless cluster",
+ createStep: func() resource.TestStep {
+ return legacyServerlessClusterWithSpendLimitStep(clusterName, 10_00)
+ },
+ initialCluster: singleRegionClusterWithLimits("BASIC", 40_000_000, 4096),
+ updateStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, "BASIC")
+ },
+ finalCluster: singleRegionClusterWithUnlimited("BASIC"),
+ },
+ {
+ name: "attempt to update name",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, defaultPlanType)
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ step := onDemandSingleRegionClusterNoLimitsStep("new-name", "BASIC")
+ step.ExpectError = regexp.MustCompile("Cannot update cluster name")
+ return step
+ },
+ },
+ {
+ name: "attempt to update cloud provider",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, "BASIC")
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ step := onDemandSingleRegionClusterNoLimitsStep(clusterName, defaultPlanType)
+ step.Config = strings.Replace(step.Config, "GCP", "AWS", -1)
+ step.ExpectError = regexp.MustCompile("Cannot update cluster cloud provider")
+ return step
+ },
+ },
+ {
+ name: "attempt to update plan type",
+ createStep: func() resource.TestStep {
+ return onDemandSingleRegionClusterNoLimitsStep(clusterName, defaultPlanType)
+ },
+ initialCluster: singleRegionClusterWithUnlimited("BASIC"),
+ updateStep: func() resource.TestStep {
+ return resource.TestStep{
+ Config: getTestDedicatedClusterResourceConfig(clusterName, latestClusterMajorVersion, false, 4, nil),
+ ExpectError: regexp.MustCompile("Cannot update cluster plan type"),
+ }
+ },
+ },
+ {
+ name: "request unit limit and request unit rate limit both specified",
+ createStep: func() resource.TestStep {
+ return resource.TestStep{
+ Config: `
+ resource "cockroach_cluster" "test" {
+ name = "foo"
+ cloud_provider = "GCP"
+ serverless = {
+ usage_limits = {
+ request_unit_limit = 1000000
+ provisioned_virtual_cpus = 2
+ }
+ }
+ regions = [{
+ name = "us-central1"
+ }]
+ }`,
+ ExpectError: regexp.MustCompile("Invalid Attribute Combination"),
+ }
+ },
+ },
+ {
+ name: "storage limit and request unit rate limit both specified",
+ createStep: func() resource.TestStep {
+ return resource.TestStep{
+ Config: `
+ resource "cockroach_cluster" "test" {
+ name = "foo"
+ cloud_provider = "GCP"
+ serverless = {
+ usage_limits = {
+ storage_mib_limit = 1024
+ provisioned_virtual_cpus = 2
+ }
+ }
+ regions = [{
+ name = "us-central1"
+ }]
+ }`,
+ ExpectError: regexp.MustCompile("Invalid Attribute Combination"),
+ }
+ },
+ },
+ {
+ name: "use serverless primary region on dedicated cluster",
+ createStep: func() resource.TestStep {
+ config := getTestDedicatedClusterResourceConfig(clusterName, latestClusterMajorVersion, false, 4, nil)
+ config = strings.Replace(config, "node_count: 1", "primary: true", -1)
+ return resource.TestStep{
+ Config: config,
+ ExpectError: regexp.MustCompile("Dedicated clusters do not support the primary attribute on regions."),
+ }
+ },
+ },
+ {
+ name: "invalid plan name",
+ createStep: func() resource.TestStep {
+ return resource.TestStep{
+ Config: `
+ resource "cockroach_cluster" "test" {
+ name = "foo"
+ cloud_provider = "GCP"
+ plan = "SERVERLESS"
+ serverless = {}
+ regions = [{
+ name = "us-central1"
+ }]
+ }`,
+ ExpectError: regexp.MustCompile("Invalid Attribute Value Match"),
+ }
},
- multiRegionServerlessClusterResource,
- false,
},
}
+
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
@@ -235,38 +588,68 @@ func TestIntegrationServerlessClusterResource(t *testing.T) {
return s
})()
- steps := []resource.TestStep{
- // Create initial resource.
- serverlessClusterWithSpendLimit(initialCluster.Name),
- // Apply an update.
- c.testStep(initialCluster.Name),
- // Import the resource.
- {
- SkipFunc: func() (bool, error) {
- return c.skipVerifyImport, nil
- },
- ResourceName: "cockroach_cluster.serverless",
- ImportState: true,
- ImportStateVerify: true,
- },
- }
-
- s.EXPECT().CreateCluster(gomock.Any(), gomock.Any()).
- Return(&initialCluster, nil, nil)
- s.EXPECT().GetCluster(gomock.Any(), c.finalCluster.Id).
- Return(&initialCluster, &http.Response{Status: http.StatusText(http.StatusOK)}, nil).
- Times(7)
- s.EXPECT().UpdateCluster(gomock.Any(), gomock.Any(), gomock.Any()).
- Return(&c.finalCluster, nil, nil)
- s.EXPECT().GetCluster(gomock.Any(), c.finalCluster.Id).
- Return(&c.finalCluster, &http.Response{Status: http.StatusText(http.StatusOK)}, nil).
- Times(5)
- if !c.skipVerifyImport {
- s.EXPECT().GetCluster(gomock.Any(), c.finalCluster.Id).
- Return(&c.finalCluster, &http.Response{Status: http.StatusText(http.StatusOK)}, nil).
- Times(2)
+ // Return the initial cluster until Update is called, after which point
+ // return the final cluster.
+ var updateCalled bool
+ s.EXPECT().
+ GetCluster(gomock.Any(), c.initialCluster.Id).
+ DoAndReturn(func(context.Context, string) (*client.Cluster, *http.Response, error) {
+ cluster := &c.initialCluster
+ if updateCalled {
+ cluster = &c.finalCluster
+ }
+ return cluster, &http.Response{Status: http.StatusText(http.StatusOK)}, nil
+ }).AnyTimes()
+
+ var steps []resource.TestStep
+ createStep := c.createStep()
+ steps = append(steps, createStep)
+
+ if createStep.ExpectError == nil {
+ // Use DoAndReturn so that it's easy to set break points.
+ s.EXPECT().
+ CreateCluster(gomock.Any(), gomock.Any()).
+ DoAndReturn(func(_ context.Context, req *client.CreateClusterRequest) (*client.Cluster, *http.Response, error) {
+ if c.validateCreate != nil {
+ if err := c.validateCreate(req); err != nil {
+ return nil, nil, err
+ }
+ }
+ return &c.initialCluster, nil, nil
+ })
+ s.EXPECT().
+ DeleteCluster(gomock.Any(), c.initialCluster.Id).
+ DoAndReturn(func(context.Context, string) (*client.Cluster, *http.Response, error) {
+ return &c.finalCluster, nil, nil
+ })
+
+ updateStep := c.updateStep()
+ steps = append(steps, updateStep)
+
+ if updateStep.ExpectError == nil {
+ s.EXPECT().
+ UpdateCluster(gomock.Any(), gomock.Any(), gomock.Any()).
+ DoAndReturn(func(_ context.Context, _ string, spec *client.UpdateClusterSpecification) (*client.Cluster, *http.Response, error) {
+ if c.validateUpdate != nil {
+ if err := c.validateUpdate(spec); err != nil {
+ return nil, nil, err
+ }
+ }
+ updateCalled = true
+ return &c.finalCluster, nil, nil
+ })
+
+ // Test import and refresh.
+ steps = append(steps, resource.TestStep{
+ ResourceName: "cockroach_cluster.test",
+ ImportState: true,
+ ImportStateVerify: true,
+ ImportStateVerifyIgnore: c.ignoreImportPaths,
+ }, resource.TestStep{
+ RefreshState: true,
+ })
+ }
}
- s.EXPECT().DeleteCluster(gomock.Any(), c.finalCluster.Id)
resource.Test(t, resource.TestCase{
IsUnitTest: true,
@@ -278,68 +661,73 @@ func TestIntegrationServerlessClusterResource(t *testing.T) {
}
}
-func serverlessClusterWithSpendLimit(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+func onDemandSingleRegionClusterNoLimitsStep(
+ clusterName string,
+ planType client.PlanType,
+) resource.TestStep {
+ var plan string
+ if planType == "" {
+ planType = client.PLANTYPE_BASIC
+ } else {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
return resource.TestStep{
- // Cluster with spend limit.
+ // Serverless cluster with no resource limits specified, which translates
+ // to unlimited on-demand resources.
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
- serverless = {
- spend_limit = 1
- }
+ %s
+ serverless = {}
regions = [{
name = "us-central1"
}]
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
}
- `, clusterName),
+ `, clusterName, plan),
Check: resource.ComposeTestCheckFunc(
- testCheckCockroachClusterExists(resourceName),
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(resourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(resourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(resourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(resourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(resourceName, "regions.#", "1"),
- resource.TestCheckResourceAttr(resourceName, "serverless.spend_limit", "1"),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.usage_limits"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(dataSourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(dataSourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(dataSourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(dataSourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(dataSourceName, "regions.#", "1"),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttrSet(dataSourceName, "serverless.usage_limits.request_unit_limit"),
- resource.TestCheckResourceAttrSet(dataSourceName, "serverless.usage_limits.storage_mib_limit"),
- resource.TestCheckResourceAttr(dataSourceName, "delete_protection", "false"),
+ testCheckCockroachClusterExists(serverlessResourceName),
+ makeDefaultServerlessResourceChecks(clusterName, planType),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.#", "0"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.#", "0"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "delete_protection", "false"),
),
}
}
-func serverlessClusterWithResourceLimits(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+func onDemandSingleRegionClusterWithLimitsStep(
+ clusterName string,
+ planType client.PlanType,
+ requestUnitLimit int64,
+ storageMibLimit int64,
+) resource.TestStep {
+ var plan string
+ if planType == "" {
+ planType = client.PLANTYPE_BASIC
+ } else {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
return resource.TestStep{
- // Update cluster to use resource limits.
+ // Serverless cluster with resource limits.
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
+ %s
serverless = {
usage_limits = {
- request_unit_limit = 10000000000
- storage_mib_limit = 102400
+ request_unit_limit = %d
+ storage_mib_limit = %d
}
}
regions = [{
@@ -348,35 +736,67 @@ func serverlessClusterWithResourceLimits(clusterName string) resource.TestStep {
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
}
- `, clusterName),
+ `, clusterName, plan, requestUnitLimit, storageMibLimit),
Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
+ makeDefaultServerlessResourceChecks(clusterName, planType),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.request_unit_limit", strconv.Itoa(int(requestUnitLimit))),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.storage_mib_limit", strconv.Itoa(int(storageMibLimit))),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.provisioned_virtual_cpus"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit", strconv.Itoa(int(requestUnitLimit))),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit", strconv.Itoa(int(storageMibLimit))),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus"),
),
}
}
-func serverlessClusterWithNoLimits(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+func onDemandSingleRegionClusterWithUnlimitedStep(
+ clusterName string,
+ planType client.PlanType,
+ upgradeType *client.UpgradeTypeType,
+) resource.TestStep {
+ var plan string
+ if planType == "" {
+ planType = client.PLANTYPE_BASIC
+ } else {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
+ testCheckFuncs := []resource.TestCheckFunc{
+ makeDefaultServerlessResourceChecks(clusterName, planType),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.#", "0"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.provisioned_virtual_cpus"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.storage_mib_limit"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.#", "0"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit"),
+ }
+
+ var upgradeTypeConfig string
+ if upgradeType != nil {
+ upgradeTypeConfig = fmt.Sprintf("upgrade_type = \"%s\"", *upgradeType)
+ testCheckFuncs = append(
+ testCheckFuncs,
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.upgrade_type", string(*upgradeType)),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.upgrade_type", string(*upgradeType)),
+ )
+ }
+
return resource.TestStep{
- // Update cluster to have no limits.
+ // Serverless cluster with unlimited on-demand resources.
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
+ %s
serverless = {
- usage_limits = null
+ usage_limits = {}
+ %s
}
regions = [{
name = "us-central1"
@@ -384,32 +804,60 @@ func serverlessClusterWithNoLimits(clusterName string) resource.TestStep {
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
}
- `, clusterName),
- Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.spend_limit"),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.usage_limits"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.spend_limit"),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.usage_limits"),
- ),
+ `, clusterName, plan, upgradeTypeConfig),
+ Check: resource.ComposeTestCheckFunc(testCheckFuncs...),
}
}
-func serverlessClusterWithZeroSpendLimit(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+func provisionedSingleRegionClusterStep(
+ clusterName string,
+ planType client.PlanType,
+ provisionedVirtualCpus int,
+ upgradeType *client.UpgradeTypeType,
+) resource.TestStep {
+ provisionedVirtualCpusStr := strconv.Itoa(provisionedVirtualCpus)
+
+ var plan string
+ if planType == "" {
+ planType = client.PLANTYPE_STANDARD
+ } else {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
+ testCheckFuncs := []resource.TestCheckFunc{
+ makeDefaultServerlessResourceChecks(clusterName, planType),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.provisioned_virtual_cpus", provisionedVirtualCpusStr),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.storage_mib_limit"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus", provisionedVirtualCpusStr),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit"),
+ }
+
+ var upgradeTypeConfig string
+ if upgradeType != nil {
+ upgradeTypeConfig = fmt.Sprintf("upgrade_type = \"%s\"", *upgradeType)
+ testCheckFuncs = append(
+ testCheckFuncs,
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.upgrade_type", string(*upgradeType)),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.upgrade_type", string(*upgradeType)),
+ )
+ }
+
return resource.TestStep{
+ // Serverless cluster with provisioned resources.
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
+ %s
serverless = {
- spend_limit = 0
+ usage_limits = {
+ provisioned_virtual_cpus = %d
+ }
+ %s
}
regions = [{
name = "us-central1"
@@ -417,33 +865,31 @@ func serverlessClusterWithZeroSpendLimit(clusterName string) resource.TestStep {
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
}
- `, clusterName),
- Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckResourceAttr(resourceName, "serverless.spend_limit", "0"),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.usage_limits"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.usage_limits"),
- ),
+ `, clusterName, plan, provisionedVirtualCpus, upgradeTypeConfig),
+ Check: resource.ComposeTestCheckFunc(testCheckFuncs...),
}
}
-func multiRegionServerlessClusterResource(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+func provisionedMultiRegionClusterWithLimitStep(
+ clusterName string,
+ planType client.PlanType,
+) resource.TestStep {
+ var plan string
+ if planType != "" {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
return resource.TestStep{
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
+ %s
serverless = {
usage_limits = {
- request_unit_limit = 10000000000
- storage_mib_limit = 102400
+ provisioned_virtual_cpus = 6
}
}
regions = [
@@ -456,63 +902,61 @@ func multiRegionServerlessClusterResource(clusterName string) resource.TestStep
},
{
name = "us-west2"
+ primary = false
},
]
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
}
- `, clusterName),
+ `, clusterName, plan),
Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(resourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(resourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(resourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(resourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(resourceName, "regions.#", "3"),
- resource.TestCheckResourceAttr(resourceName, "regions.0.name", "europe-west1"),
- resource.TestCheckResourceAttr(resourceName, "regions.0.primary", "false"),
- resource.TestCheckResourceAttr(resourceName, "regions.1.name", "us-east1"),
- resource.TestCheckResourceAttr(resourceName, "regions.1.primary", "true"),
- resource.TestCheckResourceAttr(resourceName, "regions.2.name", "us-west2"),
- resource.TestCheckResourceAttr(resourceName, "regions.2.primary", "false"),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(dataSourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(dataSourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(dataSourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(dataSourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(dataSourceName, "regions.#", "3"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.0.name", "europe-west1"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.0.primary", "false"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.1.name", "us-east1"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.1.primary", "true"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.2.name", "us-west2"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.2.primary", "false"),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
+ makeDefaultServerlessResourceChecks(clusterName, "STANDARD"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.#", "3"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.0.name", "europe-west1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.0.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.1.name", "us-east1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.1.primary", "true"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.2.name", "us-west2"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.2.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.provisioned_virtual_cpus", "6"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.storage_mib_limit"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.#", "3"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.0.name", "europe-west1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.0.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.1.name", "us-east1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.1.primary", "true"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.2.name", "us-west2"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.2.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus", "6"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit"),
),
}
}
-func multiRegionServerlessClusterResourceRegionUpdate(clusterName string) resource.TestStep {
- const (
- resourceName = "cockroach_cluster.serverless"
- dataSourceName = "data.cockroach_cluster.test"
- )
+// provisionedMultiRegionClusterUpdatedStep updates some of the fields in
+// provisionedMultiRegionClusterWithLimitStep.
+func provisionedMultiRegionClusterUpdatedStep(
+ clusterName string,
+ planType client.PlanType,
+) resource.TestStep {
+ var plan string
+ if planType != "" {
+ plan = fmt.Sprintf("plan = \"%s\"", planType)
+ }
+
return resource.TestStep{
Config: fmt.Sprintf(`
- resource "cockroach_cluster" "serverless" {
+ resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
+ %s
serverless = {
usage_limits = {
- request_unit_limit = 10000000000
- storage_mib_limit = 102400
+ provisioned_virtual_cpus = 8
}
}
regions = [
@@ -530,45 +974,89 @@ func multiRegionServerlessClusterResourceRegionUpdate(clusterName string) resour
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.serverless.id
+ id = cockroach_cluster.test.id
+ }
+ `, clusterName, plan),
+ Check: resource.ComposeTestCheckFunc(
+ makeDefaultServerlessResourceChecks(clusterName, "STANDARD"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.#", "3"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.0.name", "europe-west1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.0.primary", "true"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.1.name", "us-east1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.1.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.2.name", "us-west2"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.2.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.usage_limits.provisioned_virtual_cpus", "8"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits.storage_mib_limit"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.#", "3"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.0.name", "europe-west1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.0.primary", "true"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.1.name", "us-east1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.1.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.2.name", "us-west2"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.2.primary", "false"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus", "8"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit"),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "delete_protection", "false"),
+ ),
+ }
+}
+
+func legacyServerlessClusterWithSpendLimitStep(
+ clusterName string,
+ spendLimit int64,
+) resource.TestStep {
+ return resource.TestStep{
+ // Serverless cluster with spend limit.
+ Config: fmt.Sprintf(`
+ resource "cockroach_cluster" "test" {
+ name = "%s"
+ cloud_provider = "GCP"
+ serverless = {
+ spend_limit = %d
+ }
+ regions = [{
+ name = "us-central1"
+ }]
+ }
+
+ data "cockroach_cluster" "test" {
+ id = cockroach_cluster.test.id
}
- `, clusterName),
+ `, clusterName, spendLimit),
Check: resource.ComposeTestCheckFunc(
- resource.TestCheckResourceAttr(resourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(resourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(resourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(resourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(resourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(resourceName, "regions.#", "3"),
- resource.TestCheckResourceAttr(resourceName, "regions.0.name", "europe-west1"),
- resource.TestCheckResourceAttr(resourceName, "regions.0.primary", "true"),
- resource.TestCheckResourceAttr(resourceName, "regions.1.name", "us-east1"),
- resource.TestCheckResourceAttr(resourceName, "regions.1.primary", "false"),
- resource.TestCheckResourceAttr(resourceName, "regions.2.name", "us-west2"),
- resource.TestCheckResourceAttr(resourceName, "regions.2.primary", "false"),
- resource.TestCheckNoResourceAttr(resourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(resourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
- resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
- resource.TestCheckResourceAttrSet(dataSourceName, "cloud_provider"),
- resource.TestCheckResourceAttrSet(dataSourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(dataSourceName, "plan", "SERVERLESS"),
- resource.TestCheckResourceAttr(dataSourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
- resource.TestCheckResourceAttr(dataSourceName, "regions.#", "3"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.0.name", "europe-west1"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.0.primary", "true"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.1.name", "us-east1"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.1.primary", "false"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.2.name", "us-west2"),
- resource.TestCheckResourceAttr(dataSourceName, "regions.2.primary", "false"),
- resource.TestCheckNoResourceAttr(dataSourceName, "serverless.spend_limit"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.request_unit_limit", "10000000000"),
- resource.TestCheckResourceAttr(dataSourceName, "serverless.usage_limits.storage_mib_limit", "102400"),
- resource.TestCheckResourceAttr(dataSourceName, "delete_protection", "false"),
+ testCheckCockroachClusterExists(serverlessResourceName),
+ makeDefaultServerlessResourceChecks(clusterName, "BASIC"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.#", "0"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "serverless.spend_limit", strconv.Itoa(int(spendLimit))),
+ resource.TestCheckNoResourceAttr(serverlessResourceName, "serverless.usage_limits"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "regions.#", "1"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.#", "0"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.request_unit_limit", strconv.Itoa(int(spendLimit*5_000_000*8/10/100))),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "serverless.usage_limits.storage_mib_limit", strconv.Itoa(int(spendLimit*2*1024*2/10/100))),
+ resource.TestCheckNoResourceAttr(serverlessDataSourceName, "serverless.usage_limits.provisioned_virtual_cpus"),
),
}
}
+func makeDefaultServerlessResourceChecks(clusterName string, planType client.PlanType) resource.TestCheckFunc {
+ return resource.ComposeTestCheckFunc(
+ resource.TestCheckResourceAttr(serverlessResourceName, "name", clusterName),
+ resource.TestCheckResourceAttrSet(serverlessResourceName, "cloud_provider"),
+ resource.TestCheckResourceAttrSet(serverlessResourceName, "cockroach_version"),
+ resource.TestCheckResourceAttr(serverlessResourceName, "plan", string(planType)),
+ resource.TestCheckResourceAttr(serverlessResourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "name", clusterName),
+ resource.TestCheckResourceAttrSet(serverlessDataSourceName, "cloud_provider"),
+ resource.TestCheckResourceAttrSet(serverlessDataSourceName, "cockroach_version"),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "plan", string(planType)),
+ resource.TestCheckResourceAttr(serverlessDataSourceName, "state", string(client.CLUSTERSTATETYPE_CREATED)),
+ )
+}
+
func TestAccDedicatedClusterResource(t *testing.T) {
t.Parallel()
clusterName := fmt.Sprintf("%s-dedicated-%s", tfTestPrefix, GenerateRandomString(3))
@@ -592,7 +1080,7 @@ func TestIntegrationDedicatedClusterResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: minSupportedClusterPatchVersion,
- Plan: client.PLANTYPE_DEDICATED,
+ Plan: client.PLANTYPE_ADVANCED,
CloudProvider: client.CLOUDPROVIDERTYPE_GCP,
State: client.CLUSTERSTATETYPE_CREATED,
UpgradeStatus: client.CLUSTERUPGRADESTATUSTYPE_UPGRADE_AVAILABLE,
@@ -732,7 +1220,7 @@ func TestIntegrationDedicatedClusterResource(t *testing.T) {
scaleStep := resource.TestStep{
Config: getTestDedicatedClusterResourceConfig(clusterName, latestClusterMajorVersion, false, 4, nil),
- Check: resource.TestCheckResourceAttr("cockroach_cluster.dedicated", "dedicated.num_virtual_cpus", "4"),
+ Check: resource.TestCheckResourceAttr("cockroach_cluster.test", "dedicated.num_virtual_cpus", "4"),
}
testDedicatedClusterResource(t, clusterName, true, scaleStep)
@@ -742,7 +1230,7 @@ func testDedicatedClusterResource(
t *testing.T, clusterName string, useMock bool, additionalSteps ...resource.TestStep,
) {
const (
- resourceName = "cockroach_cluster.dedicated"
+ resourceName = "cockroach_cluster.test"
dataSourceName = "data.cockroach_cluster.test"
)
@@ -754,11 +1242,11 @@ func testDedicatedClusterResource(
resource.TestCheckResourceAttr(resourceName, "name", clusterName),
resource.TestCheckResourceAttrSet(resourceName, "cloud_provider"),
resource.TestCheckResourceAttrSet(resourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(resourceName, "plan", "DEDICATED"),
+ resource.TestCheckResourceAttr(resourceName, "plan", "ADVANCED"),
resource.TestCheckResourceAttr(dataSourceName, "name", clusterName),
resource.TestCheckResourceAttrSet(dataSourceName, "cloud_provider"),
resource.TestCheckResourceAttrSet(dataSourceName, "cockroach_version"),
- resource.TestCheckResourceAttr(dataSourceName, "plan", "DEDICATED"),
+ resource.TestCheckResourceAttr(dataSourceName, "plan", "ADVANCED"),
),
},
{
@@ -845,7 +1333,7 @@ func getTestDedicatedClusterResourceConfig(
}
config := fmt.Sprintf(`
-resource "cockroach_cluster" "dedicated" {
+resource "cockroach_cluster" "test" {
name = "%s"
cloud_provider = "GCP"
cockroach_version = "%s"
@@ -861,14 +1349,14 @@ resource "cockroach_cluster" "dedicated" {
}
data "cockroach_cluster" "test" {
- id = cockroach_cluster.dedicated.id
+ id = cockroach_cluster.test.id
}
`, name, version, vcpus, deleteProtectionConfig)
if finalize {
config += fmt.Sprintf(`
resource "cockroach_finalize_version_upgrade" "test" {
- id = cockroach_cluster.dedicated.id
+ id = cockroach_cluster.test.id
cockroach_version = "%s"
}
`, version)
diff --git a/internal/provider/cmek_resource.go b/internal/provider/cmek_resource.go
index e8b18a71..0233ee74 100644
--- a/internal/provider/cmek_resource.go
+++ b/internal/provider/cmek_resource.go
@@ -23,7 +23,7 @@ import (
"reflect"
"sort"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/cmek_resource_test.go b/internal/provider/cmek_resource_test.go
index 34dd72f7..5d4e331d 100644
--- a/internal/provider/cmek_resource_test.go
+++ b/internal/provider/cmek_resource_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -58,7 +58,7 @@ func TestIntegrationCMEKResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/internal/provider/connection_string_data_source.go b/internal/provider/connection_string_data_source.go
index 4e94454c..778613ee 100644
--- a/internal/provider/connection_string_data_source.go
+++ b/internal/provider/connection_string_data_source.go
@@ -22,7 +22,7 @@ import (
"net/url"
"runtime"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
diff --git a/internal/provider/connection_string_data_source_test.go b/internal/provider/connection_string_data_source_test.go
index 5e4e3f9b..67aa71aa 100644
--- a/internal/provider/connection_string_data_source_test.go
+++ b/internal/provider/connection_string_data_source_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/database_resource.go b/internal/provider/database_resource.go
index 54822512..6ad97f97 100644
--- a/internal/provider/database_resource.go
+++ b/internal/provider/database_resource.go
@@ -22,7 +22,7 @@ import (
"net/http"
"regexp"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
diff --git a/internal/provider/database_resource_test.go b/internal/provider/database_resource_test.go
index e38b1de9..b73cd4fc 100644
--- a/internal/provider/database_resource_test.go
+++ b/internal/provider/database_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -59,14 +59,15 @@ func TestIntegrationDatabaseResource(t *testing.T) {
defer HookGlobal(&NewService, func(c *client.Client) client.Service {
return s
})()
- spendLimit := int32(1)
cluster := client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
+ Plan: "BASIC",
CloudProvider: "GCP",
Config: client.ClusterConfig{
Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &spendLimit,
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
},
State: "CREATED",
@@ -193,12 +194,10 @@ func getTestDatabaseResourceConfig(clusterName, databaseName string) string {
resource "cockroach_cluster" "serverless" {
name = "%s"
cloud_provider = "GCP"
- serverless = {
- spend_limit = 1
- }
- regions = [{
- name = "us-central1"
- }]
+ serverless = {}
+ regions = [{
+ name = "us-central1"
+ }]
}
resource "cockroach_database" "test_database" {
diff --git a/internal/provider/finalize_version_upgrade_resource.go b/internal/provider/finalize_version_upgrade_resource.go
index c6ccff7e..4d4e6002 100644
--- a/internal/provider/finalize_version_upgrade_resource.go
+++ b/internal/provider/finalize_version_upgrade_resource.go
@@ -21,7 +21,7 @@ import (
"fmt"
"strings"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/folder_data_source.go b/internal/provider/folder_data_source.go
index 126b22c9..9b1637aa 100644
--- a/internal/provider/folder_data_source.go
+++ b/internal/provider/folder_data_source.go
@@ -22,7 +22,7 @@ import (
"net/http"
"strings"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework-validators/datasourcevalidator"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
diff --git a/internal/provider/folder_data_source_test.go b/internal/provider/folder_data_source_test.go
index 971dbdbc..048bef3c 100644
--- a/internal/provider/folder_data_source_test.go
+++ b/internal/provider/folder_data_source_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/folder_resource.go b/internal/provider/folder_resource.go
index fd1b5d61..60fb5018 100644
--- a/internal/provider/folder_resource.go
+++ b/internal/provider/folder_resource.go
@@ -5,7 +5,7 @@ import (
"fmt"
"net/http"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/cockroachdb/terraform-provider-cockroach/internal/validators"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
diff --git a/internal/provider/folder_resource_test.go b/internal/provider/folder_resource_test.go
index e96bfb0c..03cb1565 100644
--- a/internal/provider/folder_resource_test.go
+++ b/internal/provider/folder_resource_test.go
@@ -8,7 +8,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/log_export_config_resource.go b/internal/provider/log_export_config_resource.go
index 14a846df..181d4beb 100644
--- a/internal/provider/log_export_config_resource.go
+++ b/internal/provider/log_export_config_resource.go
@@ -22,7 +22,7 @@ import (
"net/http"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/log_export_config_resource_test.go b/internal/provider/log_export_config_resource_test.go
index 4d311638..a5b89ecd 100644
--- a/internal/provider/log_export_config_resource_test.go
+++ b/internal/provider/log_export_config_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -61,7 +61,7 @@ func TestIntegrationLogExportConfigResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/internal/provider/maintenance_window.go b/internal/provider/maintenance_window.go
index 4fe39247..cb151cad 100644
--- a/internal/provider/maintenance_window.go
+++ b/internal/provider/maintenance_window.go
@@ -23,7 +23,7 @@ import (
"strconv"
"strings"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
diff --git a/internal/provider/maintenance_window_test.go b/internal/provider/maintenance_window_test.go
index 1d8cfcd5..3d5a533d 100644
--- a/internal/provider/maintenance_window_test.go
+++ b/internal/provider/maintenance_window_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -56,7 +56,7 @@ func TestIntegrationMaintenanceWindowResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "GCP",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/internal/provider/metric_export_cloudwatch_config_resource.go b/internal/provider/metric_export_cloudwatch_config_resource.go
index bd605a0b..734e101c 100644
--- a/internal/provider/metric_export_cloudwatch_config_resource.go
+++ b/internal/provider/metric_export_cloudwatch_config_resource.go
@@ -23,7 +23,7 @@ import (
"strings"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/metric_export_cloudwatch_config_resource_test.go b/internal/provider/metric_export_cloudwatch_config_resource_test.go
index 12e6f4f1..9257e410 100644
--- a/internal/provider/metric_export_cloudwatch_config_resource_test.go
+++ b/internal/provider/metric_export_cloudwatch_config_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -61,7 +61,7 @@ func TestIntegrationMetricExportCloudWatchConfigResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/internal/provider/metric_export_datadog_config_resource.go b/internal/provider/metric_export_datadog_config_resource.go
index 851776db..344b9dc8 100644
--- a/internal/provider/metric_export_datadog_config_resource.go
+++ b/internal/provider/metric_export_datadog_config_resource.go
@@ -23,7 +23,7 @@ import (
"strings"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/metric_export_datadog_config_resource_test.go b/internal/provider/metric_export_datadog_config_resource_test.go
index a3f6e607..47a4361b 100644
--- a/internal/provider/metric_export_datadog_config_resource_test.go
+++ b/internal/provider/metric_export_datadog_config_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -61,7 +61,7 @@ func TestIntegrationMetricExportDatadogConfigResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/internal/provider/metric_export_prometheus_config_resource.go b/internal/provider/metric_export_prometheus_config_resource.go
index 5d984d8e..c8c25e3b 100644
--- a/internal/provider/metric_export_prometheus_config_resource.go
+++ b/internal/provider/metric_export_prometheus_config_resource.go
@@ -8,7 +8,7 @@ import (
"strings"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/metric_export_prometheus_config_resource_test.go b/internal/provider/metric_export_prometheus_config_resource_test.go
index 55c8cd9e..c65265c2 100644
--- a/internal/provider/metric_export_prometheus_config_resource_test.go
+++ b/internal/provider/metric_export_prometheus_config_resource_test.go
@@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/models.go b/internal/provider/models.go
index cf4664a1..e8577dec 100644
--- a/internal/provider/models.go
+++ b/internal/provider/models.go
@@ -47,14 +47,18 @@ type DedicatedClusterConfig struct {
}
type ServerlessClusterConfig struct {
+ // TODO(andyk): SpendLimit is deprecated and will be removed in a future
+ // release.
SpendLimit types.Int64 `tfsdk:"spend_limit"`
RoutingId types.String `tfsdk:"routing_id"`
+ UpgradeType types.String `tfsdk:"upgrade_type"`
UsageLimits *UsageLimits `tfsdk:"usage_limits"`
}
type UsageLimits struct {
RequestUnitLimit types.Int64 `tfsdk:"request_unit_limit"`
StorageMibLimit types.Int64 `tfsdk:"storage_mib_limit"`
+ ProvisionedVirtualCpus types.Int64 `tfsdk:"provisioned_virtual_cpus"`
}
type SQLUser struct {
diff --git a/internal/provider/organization_data_source_test.go b/internal/provider/organization_data_source_test.go
index c0b02d3a..cf062e3e 100644
--- a/internal/provider/organization_data_source_test.go
+++ b/internal/provider/organization_data_source_test.go
@@ -21,7 +21,7 @@ import (
"testing"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
diff --git a/internal/provider/person_user_data_source_test.go b/internal/provider/person_user_data_source_test.go
index c1936ba5..a13c935b 100644
--- a/internal/provider/person_user_data_source_test.go
+++ b/internal/provider/person_user_data_source_test.go
@@ -21,7 +21,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
diff --git a/internal/provider/private_endpoint_connection_resource.go b/internal/provider/private_endpoint_connection_resource.go
index 4777f1ea..87d35428 100644
--- a/internal/provider/private_endpoint_connection_resource.go
+++ b/internal/provider/private_endpoint_connection_resource.go
@@ -23,7 +23,7 @@ import (
"regexp"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
diff --git a/internal/provider/private_endpoint_connection_resource_test.go b/internal/provider/private_endpoint_connection_resource_test.go
index b371b977..dbb6e20a 100644
--- a/internal/provider/private_endpoint_connection_resource_test.go
+++ b/internal/provider/private_endpoint_connection_resource_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -81,7 +81,6 @@ func TestIntegrationPrivateEndpointConnectionResource(t *testing.T) {
Connections: []client.PrivateEndpointConnection{connection},
}
- zeroSpendLimit := int32(0)
cases := []struct {
name string
finalCluster client.Cluster
@@ -91,6 +90,7 @@ func TestIntegrationPrivateEndpointConnectionResource(t *testing.T) {
client.Cluster{
Name: clusterName,
Id: clusterID,
+ Plan: "ADVANCED",
CloudProvider: "AWS",
Config: client.ClusterConfig{
Dedicated: &client.DedicatedHardwareConfig{
@@ -112,13 +112,13 @@ func TestIntegrationPrivateEndpointConnectionResource(t *testing.T) {
client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
- Plan: "SERVERLESS",
+ Plan: "STANDARD",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &zeroSpendLimit,
- RoutingId: "routing-id",
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
},
Regions: []client.Region{
@@ -240,9 +240,7 @@ func getTestPrivateEndpointConnectionResourceConfigForServerless(clusterName str
resource "cockroach_cluster" "serverless" {
name = "%s"
cloud_provider = "AWS"
- serverless = {
- spend_limit = 0
- }
+ serverless = {}
regions = [{
name = "us-east-1"
}]
diff --git a/internal/provider/private_endpoint_services_resource.go b/internal/provider/private_endpoint_services_resource.go
index a279868d..56954a8e 100644
--- a/internal/provider/private_endpoint_services_resource.go
+++ b/internal/provider/private_endpoint_services_resource.go
@@ -22,7 +22,7 @@ import (
"net/http"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
diff --git a/internal/provider/private_endpoint_services_resource_test.go b/internal/provider/private_endpoint_services_resource_test.go
index 2bfaf83c..fbbb4aff 100644
--- a/internal/provider/private_endpoint_services_resource_test.go
+++ b/internal/provider/private_endpoint_services_resource_test.go
@@ -23,7 +23,7 @@ import (
"strconv"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -40,7 +40,7 @@ func TestAccDedicatedPrivateEndpointServicesResource(t *testing.T) {
}
// TestAccServerlessPrivateEndpointServicesResource attempts to create, check,
-// and destroy a real serverless cluster and endpoint services. It will be
+// and destroy a real Serverless cluster and endpoint services. It will be
// skipped if TF_ACC isn't set.
func TestAccServerlessPrivateEndpointServicesResource(t *testing.T) {
t.Parallel()
@@ -58,7 +58,6 @@ func TestIntegrationPrivateEndpointServicesResource(t *testing.T) {
}
true_val := true
- zeroSpendLimit := int32(0)
cases := []struct {
name string
finalCluster client.Cluster
@@ -91,6 +90,7 @@ func TestIntegrationPrivateEndpointServicesResource(t *testing.T) {
client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
+ Plan: "ADVANCED",
CloudProvider: "AWS",
Config: client.ClusterConfig{
Dedicated: &client.DedicatedHardwareConfig{
@@ -114,13 +114,13 @@ func TestIntegrationPrivateEndpointServicesResource(t *testing.T) {
client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
- Plan: "SERVERLESS",
+ Plan: "BASIC",
CloudProvider: "AWS",
State: "CREATED",
Config: client.ClusterConfig{
Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &zeroSpendLimit,
- RoutingId: "routing-id",
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
},
Regions: []client.Region{
@@ -315,9 +315,7 @@ func getTestPrivateEndpointServicesResourceConfigForServerless(clusterName strin
resource "cockroach_cluster" "serverless" {
name = "%s"
cloud_provider = "AWS"
- serverless = {
- spend_limit = 0
- }
+ serverless = {}
regions = [
{ name = "us-east-1", primary = true },
{ name = "eu-central-1" },
diff --git a/internal/provider/private_endpoint_trusted_owner_resource.go b/internal/provider/private_endpoint_trusted_owner_resource.go
index 2325e419..9e9f85ad 100644
--- a/internal/provider/private_endpoint_trusted_owner_resource.go
+++ b/internal/provider/private_endpoint_trusted_owner_resource.go
@@ -22,7 +22,7 @@ import (
"net/http"
"regexp"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
diff --git a/internal/provider/private_endpoint_trusted_owner_resource_test.go b/internal/provider/private_endpoint_trusted_owner_resource_test.go
index d706b309..88d2b360 100644
--- a/internal/provider/private_endpoint_trusted_owner_resource_test.go
+++ b/internal/provider/private_endpoint_trusted_owner_resource_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -115,7 +115,7 @@ func TestIntegrationPrivateEndpointTrustedOwnerResource(t *testing.T) {
}
// TODO(jaylim-crl): Update this to also test serverless once we support this
-// feature for serverless clusters within CockroachCloud.
+// feature for isServerless clusters within CockroachCloud.
func testPrivateEndpointTrustedOwnerResource(t *testing.T, clusterName string, useMock bool) {
const resourceName = "cockroach_private_endpoint_trusted_owner.owner"
resource.Test(t, resource.TestCase{
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 91c364e0..589883d8 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -20,7 +20,7 @@ import (
"context"
"os"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/terraform-plugin-framework/datasource"
tf_provider "github.com/hashicorp/terraform-plugin-framework/provider"
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
index a87ca7b1..3a7a2680 100644
--- a/internal/provider/provider_test.go
+++ b/internal/provider/provider_test.go
@@ -22,7 +22,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
tf_provider "github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/providerserver"
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
diff --git a/internal/provider/service_account_resource.go b/internal/provider/service_account_resource.go
index 88cd2991..42495057 100644
--- a/internal/provider/service_account_resource.go
+++ b/internal/provider/service_account_resource.go
@@ -5,7 +5,7 @@ import (
"fmt"
"net/http"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -197,7 +197,7 @@ func (r *serviceAccountResource) Update(
}
// Only send the description if the value is present in resource.
- if !(plan.Description.IsNull() || plan.Description.IsUnknown()) {
+ if IsKnown(plan.Description) {
updateSpec.SetDescription(plan.Description.ValueString())
}
diff --git a/internal/provider/service_account_resource_test.go b/internal/provider/service_account_resource_test.go
index ba0b7d25..348ed52c 100644
--- a/internal/provider/service_account_resource_test.go
+++ b/internal/provider/service_account_resource_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/sql_user_resource.go b/internal/provider/sql_user_resource.go
index 75621505..f5853e2c 100644
--- a/internal/provider/sql_user_resource.go
+++ b/internal/provider/sql_user_resource.go
@@ -25,7 +25,7 @@ import (
"net/http"
"regexp"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
diff --git a/internal/provider/sql_user_resource_test.go b/internal/provider/sql_user_resource_test.go
index f7dda902..0928d272 100644
--- a/internal/provider/sql_user_resource_test.go
+++ b/internal/provider/sql_user_resource_test.go
@@ -24,7 +24,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -62,14 +62,15 @@ func TestIntegrationSqlUserResource(t *testing.T) {
defer HookGlobal(&NewService, func(c *client.Client) client.Service {
return s
})()
- spendLimit := int32(1)
cluster := client.Cluster{
Name: clusterName,
Id: uuid.Nil.String(),
+ Plan: "BASIC",
CloudProvider: "GCP",
Config: client.ClusterConfig{
Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &spendLimit,
+ RoutingId: "routing-id",
+ UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC,
},
},
State: "CREATED",
@@ -189,9 +190,7 @@ func getTestSqlUserResourceConfig(
resource "cockroach_cluster" "serverless" {
name = "%s"
cloud_provider = "GCP"
- serverless = {
- spend_limit = 1
- }
+ serverless = {}
regions = [{
name = "us-central1"
}]
diff --git a/internal/provider/user_role_grant_resource.go b/internal/provider/user_role_grant_resource.go
index 490f0663..81f247ec 100644
--- a/internal/provider/user_role_grant_resource.go
+++ b/internal/provider/user_role_grant_resource.go
@@ -21,7 +21,7 @@ import (
"fmt"
"strings"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/google/uuid"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
diff --git a/internal/provider/user_role_grant_resource_test.go b/internal/provider/user_role_grant_resource_test.go
index 25f3cbc3..b2274cd4 100644
--- a/internal/provider/user_role_grant_resource_test.go
+++ b/internal/provider/user_role_grant_resource_test.go
@@ -24,7 +24,7 @@ import (
"regexp"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -68,15 +68,12 @@ func TestIntegrationRoleGrantResource(t *testing.T) {
Description: "A service account used for managing access to the test cluster",
}
- spendLimit := int32(1)
cluster := client.Cluster{
Name: clusterName,
Id: clusterID,
CloudProvider: "GCP",
Config: client.ClusterConfig{
- Serverless: &client.ServerlessClusterConfig{
- SpendLimit: &spendLimit,
- },
+ Serverless: &client.ServerlessClusterConfig{},
},
State: "CREATED",
Regions: []client.Region{
diff --git a/internal/provider/user_role_grants_resource.go b/internal/provider/user_role_grants_resource.go
index 7acf4dd5..13efde06 100644
--- a/internal/provider/user_role_grants_resource.go
+++ b/internal/provider/user_role_grants_resource.go
@@ -20,7 +20,7 @@ import (
"context"
"fmt"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
diff --git a/internal/provider/user_role_grants_resource_test.go b/internal/provider/user_role_grants_resource_test.go
index c557a97d..f1fff611 100644
--- a/internal/provider/user_role_grants_resource_test.go
+++ b/internal/provider/user_role_grants_resource_test.go
@@ -23,7 +23,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
diff --git a/internal/provider/utils.go b/internal/provider/utils.go
index aa13566c..59f98287 100644
--- a/internal/provider/utils.go
+++ b/internal/provider/utils.go
@@ -10,7 +10,7 @@ import (
"runtime"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
datasource_schema "github.com/hashicorp/terraform-plugin-framework/datasource/schema"
diff --git a/internal/provider/version_deferral.go b/internal/provider/version_deferral.go
index 4df5c392..3437c739 100644
--- a/internal/provider/version_deferral.go
+++ b/internal/provider/version_deferral.go
@@ -18,7 +18,7 @@ import (
"fmt"
"net/http"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
diff --git a/internal/provider/version_deferral_test.go b/internal/provider/version_deferral_test.go
index 7790f398..07d94510 100644
--- a/internal/provider/version_deferral_test.go
+++ b/internal/provider/version_deferral_test.go
@@ -19,7 +19,7 @@ import (
"os"
"testing"
- "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
@@ -53,7 +53,7 @@ func TestIntegrationVersionDeferralResource(t *testing.T) {
Id: clusterID,
Name: clusterName,
CockroachVersion: "v22.2.0",
- Plan: "DEDICATED",
+ Plan: "ADVANCED",
CloudProvider: "GCP",
State: "CREATED",
Config: client.ClusterConfig{
diff --git a/mock/build.go b/mock/build.go
index b8e10ff1..36813c6b 100644
--- a/mock/build.go
+++ b/mock/build.go
@@ -1,2 +1,2 @@
-//go:generate mockgen -package mock_client -destination ./service.go github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client Service
+//go:generate mockgen -package mock_client -destination ./service.go github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client Service
package mock_client
diff --git a/mock/service.go b/mock/service.go
index 8ebaca7f..f1bcf0f8 100644
--- a/mock/service.go
+++ b/mock/service.go
@@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client (interfaces: Service)
+// Source: github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client (interfaces: Service)
// Package mock_client is a generated GoMock package.
package mock_client
@@ -9,7 +9,7 @@ import (
http "net/http"
reflect "reflect"
- client "github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client"
+ client "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client"
gomock "github.com/golang/mock/gomock"
)
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/LICENSE b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/LICENSE
similarity index 100%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/LICENSE
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/LICENSE
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/client.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/client.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/client.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/client.go
index 47669854..6cc4d00d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/client.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/client.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -45,7 +45,7 @@ var (
xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
)
-// Client manages communication with the CockroachDB Cloud API v2023-04-10.
+// Client manages communication with the CockroachDB Cloud API v2024-09-16.
type Client struct {
cfg *Configuration
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/configuration.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go
similarity index 96%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/configuration.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go
index e4b7a59c..cd0e03fb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/configuration.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -24,7 +24,7 @@ import (
const DefaultServerURL string = "https://cockroachlabs.cloud"
-const ApiVersion = "2023-04-10"
+const ApiVersion = "2024-09-16"
// Configuration stores the configuration of the API client.
type Configuration struct {
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_request.go
similarity index 97%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_request.go
index 017ea68a..bdc65637 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_request.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// AddEgressRuleRequest AddEgressRuleRequest is the input for the rpc AddEgressRule()..
+// AddEgressRuleRequest struct for AddEgressRuleRequest.
type AddEgressRuleRequest struct {
// description is text that serves to document the rules purpose.
Description string `json:"description"`
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_response.go
similarity index 92%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_response.go
index 04674cef..d66d7d25 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_egress_rule_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// AddEgressRuleResponse AddEgressRuleResponse is the response message of the AddEgressRule RPC..
+// AddEgressRuleResponse struct for AddEgressRuleResponse.
type AddEgressRuleResponse struct {
Rule *EgressRule `json:"Rule,omitempty"`
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_jwt_issuer_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_jwt_issuer_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_jwt_issuer_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_jwt_issuer_request.go
index 4e069887..cfa4b9ac 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_jwt_issuer_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_jwt_issuer_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_connection_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_connection_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_connection_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_connection_request.go
index ea3827a7..6bbed42d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_connection_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_connection_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_request.go
index 4dde7399..f07ee6cb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_response.go
index 065374fc..d17b9c9c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_add_private_endpoint_trusted_owner_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry.go
index 5683d749..0755c08c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry_1.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry_1.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry_1.go
index f274b21e..1895c9bf 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_allowlist_entry_1.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry_1.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_any.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go
similarity index 62%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_any.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go
index dfc0a95f..6b0d8529 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_any.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go
@@ -14,13 +14,13 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// Any `Any` contains an arbitrary serialized protocol buffer message along with a URL that describes the type of the serialized message. Protobuf library provides support to pack/unpack Any values in the form of utility functions or additional generated methods of the Any type. Example 1: Pack and unpack a message in C++. Foo foo = ...; Any any; any.PackFrom(foo); ... if (any.UnpackTo(&foo)) { ... } Example 2: Pack and unpack a message in Java. Foo foo = ...; Any any = Any.pack(foo); ... if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } // or ... if (any.isSameTypeAs(Foo.getDefaultInstance())) { foo = any.unpack(Foo.getDefaultInstance()); } Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() any.Pack(foo) ... if any.Is(Foo.DESCRIPTOR): any.Unpack(foo) ... Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) if err != nil { ... } ... foo := &pb.Foo{} if err := any.UnmarshalTo(foo); err != nil { ... } The pack methods provided by protobuf library will by default use 'type.googleapis.com/full.type.name' as the type URL and the unpack methods only use the fully qualified type name after the last '/' in the type URL, for example \"foo.bar.com/x/y.z\" will yield type name \"y.z\". JSON ==== The JSON representation of an `Any` value uses the regular representation of the deserialized, embedded message, with an additional field `@type` which contains the type URL. Example: package google.profile; message Person { string first_name = 1; string last_name = 2; } { \"@type\": \"type.googleapis.com/google.profile.Person\", \"firstName\": , \"lastName\": } If the embedded message type is well-known and has a custom JSON representation, that representation will be embedded adding a field `value` which holds the custom JSON in addition to the `@type` field. Example (for message [google.protobuf.Duration][]): { \"@type\": \"type.googleapis.com/google.protobuf.Duration\", \"value\": \"1.212s\" }.
+// Any `Any` contains an arbitrary serialized protocol buffer message along with a URL that describes the type of the serialized message. Protobuf library provides support to pack/unpack Any values in the form of utility functions or additional generated methods of the Any type. Example 1: Pack and unpack a message in C++. Foo foo = ...; Any any; any.PackFrom(foo); ... if (any.UnpackTo(&foo)) { ... } Example 2: Pack and unpack a message in Java. Foo foo = ...; Any any = Any.pack(foo); ... if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() any.Pack(foo) ... if any.Is(Foo.DESCRIPTOR): any.Unpack(foo) ... Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) if err != nil { ... } ... foo := &pb.Foo{} if err := any.UnmarshalTo(foo); err != nil { ... } The pack methods provided by protobuf library will by default use 'type.googleapis.com/full.type.name' as the type URL and the unpack methods only use the fully qualified type name after the last '/' in the type URL, for example \"foo.bar.com/x/y.z\" will yield type name \"y.z\". JSON The JSON representation of an `Any` value uses the regular representation of the deserialized, embedded message, with an additional field `@type` which contains the type URL. Example: package google.profile; message Person { string first_name = 1; string last_name = 2; } { \"@type\": \"type.googleapis.com/google.profile.Person\", \"firstName\": , \"lastName\": } If the embedded message type is well-known and has a custom JSON representation, that representation will be embedded adding a field `value` which holds the custom JSON in addition to the `@type` field. Example (for message [google.protobuf.Duration][]): { \"@type\": \"type.googleapis.com/google.protobuf.Duration\", \"value\": \"1.212s\" }.
type Any struct {
- // A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted). In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows: * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][] value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the URL, or have them precompiled into a binary to avoid any lookup. Therefore, binary compatibility needs to be preserved on changes to types. (Use versioned type names to manage breaking changes.) Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com. As of May 2023, there are no widely used type server implementations and no plans to implement one. Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics.
+ // A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted). In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows: * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][] value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the URL, or have them precompiled into a binary to avoid any lookup. Therefore, binary compatibility needs to be preserved on changes to types. (Use versioned type names to manage breaking changes.) Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com. Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics.
Type *string `json:"@type,omitempty"`
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_key.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_key.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_key.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_key.go
index 3e932817..d84c1139 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_key.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_key.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config.go
index 7d300577..83e992f8 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config_1.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config_1.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config_1.go
index 42b7ffcb..21fea85d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_config_1.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config_1.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_identity_map_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_identity_map_entry.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_identity_map_entry.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_identity_map_entry.go
index 38abcf5f..01cd9d82 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_api_oidc_identity_map_entry.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_identity_map_entry.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_action.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_action.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_action.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_action.go
index cd8d373d..3fb7b2a4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_action.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_action.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_entry.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_entry.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_entry.go
index 32c18f9c..f225f4ec 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_entry.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_entry.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_metadata.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_metadata.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_metadata.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_metadata.go
index e97963cb..0c1688d5 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_metadata.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_metadata.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_source.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_source.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_source.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_source.go
index ed884453..8cbb7c6f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_audit_log_source.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_source.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection.go
index f6774e9f..f898717d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection_status_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection_status_type.go
index e94085e6..25e3414c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connection_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connections.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connections.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connections.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connections.go
index 3e639457..da7e78ed 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_endpoint_connections.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connections.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_private_link_service_detail.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_private_link_service_detail.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_private_link_service_detail.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_private_link_service_detail.go
index 9caa37ba..b727cda0 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_aws_private_link_service_detail.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_private_link_service_detail.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_from_groups.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_from_groups.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_from_groups.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_from_groups.go
index 43348b57..152e0a86 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_from_groups.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_from_groups.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_role.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_role.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_role.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_role.go
index 2d903d6f..b39f8605 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_built_in_role.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_role.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_info.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_info.go
index e2815dd3..ca9dc010 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_status.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_status.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_status.go
index a4045dc7..c37eea29 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_client_ca_cert_status.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_status.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_region.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_region.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_region.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_region.go
index 9e69532e..591b9133 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_region.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_region.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_type.go
index a8887e63..0ce0b3c4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_provider_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_watch_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_watch_metric_export_info.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_watch_metric_export_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_watch_metric_export_info.go
index 23d9b16f..a9255960 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cloud_watch_metric_export_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_watch_metric_export_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster.go
index fd4400ef..8d889b40 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_config.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_config.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_config.go
index fadd63ca..6e820e93 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_config.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_config.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version.go
similarity index 58%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version.go
index b710a644..72eda4fe 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version.go
@@ -14,22 +14,32 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
+import (
+ "time"
+)
+
// ClusterMajorVersion For more information about CockroachDB cluster version support, see https://www.cockroachlabs.com/docs/releases/release-support-policy.html.
type ClusterMajorVersion struct {
- SupportStatus ClusterMajorVersionSupportStatusType `json:"support_status"`
- Version string `json:"version"`
+ AllowedUpgrades []string `json:"allowed_upgrades"`
+ ReleaseType ReleaseTypeType `json:"release_type"`
+ SupportEnd time.Time `json:"support_end"`
+ SupportStatus ClusterMajorVersionSupportStatusType `json:"support_status"`
+ Version string `json:"version"`
}
// NewClusterMajorVersion instantiates a new ClusterMajorVersion object.
// This constructor will assign default values to properties that have it defined,
// and makes sure properties required by API are set, but the set of arguments
// will change when the set of required properties is changed
-func NewClusterMajorVersion(supportStatus ClusterMajorVersionSupportStatusType, version string) *ClusterMajorVersion {
+func NewClusterMajorVersion(allowedUpgrades []string, releaseType ReleaseTypeType, supportEnd time.Time, supportStatus ClusterMajorVersionSupportStatusType, version string) *ClusterMajorVersion {
p := ClusterMajorVersion{}
+ p.AllowedUpgrades = allowedUpgrades
+ p.ReleaseType = releaseType
+ p.SupportEnd = supportEnd
p.SupportStatus = supportStatus
p.Version = version
return &p
@@ -43,6 +53,51 @@ func NewClusterMajorVersionWithDefaults() *ClusterMajorVersion {
return &p
}
+// GetAllowedUpgrades returns the AllowedUpgrades field value.
+func (o *ClusterMajorVersion) GetAllowedUpgrades() []string {
+ if o == nil {
+ var ret []string
+ return ret
+ }
+
+ return o.AllowedUpgrades
+}
+
+// SetAllowedUpgrades sets field value.
+func (o *ClusterMajorVersion) SetAllowedUpgrades(v []string) {
+ o.AllowedUpgrades = v
+}
+
+// GetReleaseType returns the ReleaseType field value.
+func (o *ClusterMajorVersion) GetReleaseType() ReleaseTypeType {
+ if o == nil {
+ var ret ReleaseTypeType
+ return ret
+ }
+
+ return o.ReleaseType
+}
+
+// SetReleaseType sets field value.
+func (o *ClusterMajorVersion) SetReleaseType(v ReleaseTypeType) {
+ o.ReleaseType = v
+}
+
+// GetSupportEnd returns the SupportEnd field value.
+func (o *ClusterMajorVersion) GetSupportEnd() time.Time {
+ if o == nil {
+ var ret time.Time
+ return ret
+ }
+
+ return o.SupportEnd
+}
+
+// SetSupportEnd sets field value.
+func (o *ClusterMajorVersion) SetSupportEnd(v time.Time) {
+ o.SupportEnd = v
+}
+
// GetSupportStatus returns the SupportStatus field value.
func (o *ClusterMajorVersion) GetSupportStatus() ClusterMajorVersionSupportStatusType {
if o == nil {
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version_support_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version_support_status_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version_support_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version_support_status_type.go
index 2b725066..5b785ab5 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_major_version_support_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version_support_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_state_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_state_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_state_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_state_type.go
index 5fff9621..29038e8d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_state_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_state_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_status_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_status_type.go
index e299b1e8..6af1371f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_upgrade_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_upgrade_status_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_upgrade_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_upgrade_status_type.go
index 28f4300a..c17c37a3 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_upgrade_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_upgrade_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral.go
index 2635f032..43f0ec34 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral_policy_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral_policy_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral_policy_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral_policy_type.go
index 6625f264..e112c56f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cluster_version_deferral_policy_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral_policy_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_info.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_info.go
index 0e3b1ccb..ad539e42 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_specification.go
index 1b111074..da514ca9 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_cluster_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_customer_action.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_customer_action.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_customer_action.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_customer_action.go
index 6e702747..f9aa0668 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_customer_action.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_customer_action.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_info.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_info.go
index 2b92fc00..75b9f777 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_specification.go
index 33c769c1..6cedf644 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_type.go
index 3a1aef01..627bdadb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_key_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_info.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_info.go
index 3b05028b..22c5a960 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_specification.go
index b062d7d1..2debb385 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_region_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_status.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_status.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_status.go
index 6446e9b7..50f410dc 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cmek_status.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_status.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go
index b4e10657..c3ef13ab 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_connection_string_parameters.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_connection_string_parameters.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_connection_string_parameters.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_connection_string_parameters.go
index 65e7df4e..360144fd 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_connection_string_parameters.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_connection_string_parameters.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_request.go
index 7efd91d2..b8ea7be4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_response.go
index ea7c6b31..416dc1b7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_key_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_oidc_config_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_oidc_config_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_oidc_config_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_oidc_config_request.go
index 6cdb6bb0..00d33907 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_api_oidc_config_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_oidc_config_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_request.go
index d4878423..06388f5a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_specification.go
similarity index 88%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_specification.go
index 3759f7c2..3003c3b3 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_cluster_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -24,6 +24,7 @@ type CreateClusterSpecification struct {
DeleteProtection *DeleteProtectionStateType `json:"delete_protection,omitempty"`
// Preview: The parent ID is a folder ID. An empty string or \"root\" will create a cluster at the root level.
ParentId *string `json:"parent_id,omitempty"`
+ Plan *PlanType `json:"plan,omitempty"`
Serverless *ServerlessClusterCreateSpecification `json:"serverless,omitempty"`
}
@@ -78,6 +79,20 @@ func (o *CreateClusterSpecification) SetParentId(v string) {
o.ParentId = &v
}
+// GetPlan returns the Plan field value if set, zero value otherwise.
+func (o *CreateClusterSpecification) GetPlan() PlanType {
+ if o == nil || o.Plan == nil {
+ var ret PlanType
+ return ret
+ }
+ return *o.Plan
+}
+
+// SetPlan gets a reference to the given PlanType and assigns it to the Plan field.
+func (o *CreateClusterSpecification) SetPlan(v PlanType) {
+ o.Plan = &v
+}
+
// GetServerless returns the Serverless field value if set, zero value otherwise.
func (o *CreateClusterSpecification) GetServerless() ServerlessClusterCreateSpecification {
if o == nil || o.Serverless == nil {
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_database_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_database_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_database_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_database_request.go
index c3a00a72..17f8bcbe 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_database_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_database_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_folder_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_folder_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_folder_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_folder_request.go
index bb083781..198e0bf4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_folder_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_folder_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_group_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_group_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_group_request.go
index d55d52d0..98a9c462 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_group_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_group_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_service_account_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_service_account_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_service_account_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_service_account_request.go
index b47a1d63..bd4f3533 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_service_account_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_service_account_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_sql_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_sql_user_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_sql_user_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_sql_user_request.go
index d6abc004..9a80cd6b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_sql_user_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_sql_user_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_user_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_user_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_user_request.go
index 8fa3fa3f..172d857c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_create_user_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_user_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_amount.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_amount.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_amount.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_amount.go
index a7623e98..8fb531cd 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_amount.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_amount.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_type.go
index c12bcb99..9e89f84a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_currency_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_database.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_database.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_database.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_database.go
index 6c6ff20c..db9e1579 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_database.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_database.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_metric_export_info.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_metric_export_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_metric_export_info.go
index 776fd925..c38430d7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_metric_export_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_metric_export_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_site_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_site_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_site_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_site_type.go
index ea87191a..ed572d20 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_datadog_site_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_site_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_create_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go
index 4beee162..5cd42612 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_create_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_update_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_update_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_update_specification.go
index 2c87f677..801447df 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_cluster_update_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_update_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_config.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_config.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_config.go
index 25880a89..8c863af0 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_config.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_config.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_create_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_create_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_create_specification.go
index ae79184d..c53a6531 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_create_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_create_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_update_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_update_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_update_specification.go
index 762eba32..fd48ac44 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_hardware_update_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_update_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_machine_type_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_machine_type_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_machine_type_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_machine_type_specification.go
index 0c7ffb53..e8d1e5ba 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_dedicated_machine_type_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_machine_type_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_egress_rule_response.go
similarity index 92%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_egress_rule_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_egress_rule_response.go
index a03742af..74f7faec 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_egress_rule_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_egress_rule_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// DeleteEgressRuleResponse DeleteEgressRuleResponse is the output for the DeleteEgressRule RPC..
+// DeleteEgressRuleResponse struct for DeleteEgressRuleResponse.
type DeleteEgressRuleResponse struct {
Rule *EgressRule `json:"Rule,omitempty"`
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_metric_export_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_metric_export_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_metric_export_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_metric_export_response.go
index 6ebf4223..8a2b3c10 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_metric_export_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_metric_export_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_protection_state_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_protection_state_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_protection_state_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_protection_state_type.go
index ccad705f..0684942b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_delete_protection_state_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_protection_state_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_request.go
similarity index 97%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_request.go
index 69ffbed2..a5ed20ba 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_request.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// EditEgressRuleRequest EditEgressRuleRequest is the input message to the EditEgressRule RPC..
+// EditEgressRuleRequest struct for EditEgressRuleRequest.
type EditEgressRuleRequest struct {
// description is text that serves to document the rules purpose.
Description *string `json:"description,omitempty"`
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_response.go
similarity index 92%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_response.go
index cd513bdc..ed9e65d9 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_edit_egress_rule_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// EditEgressRuleResponse EditEgressRuleResponse is the output message to the EditEgressRule RPC..
+// EditEgressRuleResponse struct for EditEgressRuleResponse.
type EditEgressRuleResponse struct {
Rule *EgressRule `json:"Rule,omitempty"`
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_rule.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_rule.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_rule.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_rule.go
index 918d59e0..4d7d051d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_rule.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_rule.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_traffic_policy_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_traffic_policy_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_traffic_policy_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_traffic_policy_type.go
index 7f1f1a9e..969ec00c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_egress_traffic_policy_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_traffic_policy_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_cloud_watch_metric_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_cloud_watch_metric_export_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_cloud_watch_metric_export_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_cloud_watch_metric_export_request.go
index fbfea490..51c3685c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_cloud_watch_metric_export_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_cloud_watch_metric_export_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_datadog_metric_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_datadog_metric_export_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_datadog_metric_export_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_datadog_metric_export_request.go
index 6d1d47d0..8d37f0bc 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_datadog_metric_export_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_datadog_metric_export_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_log_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_log_export_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_log_export_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_log_export_request.go
index d6cff9ca..6e393ad8 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_enable_log_export_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_log_export_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource.go
index 8fc552b4..8a51902b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_list.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_list.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_list.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_list.go
index b88be39b..9211612c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_list.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_list.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_type_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_type_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_type_type.go
index 08e5ca46..0bb24eba 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_folder_resource_type_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_type_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_all_roles_for_user_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_all_roles_for_user_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_all_roles_for_user_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_all_roles_for_user_response.go
index 9807a955..f89526bd 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_all_roles_for_user_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_all_roles_for_user_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_connection_string_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_connection_string_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_connection_string_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_connection_string_response.go
index 5f10a1e2..2f3c3635 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_connection_string_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_connection_string_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_egress_rule_response.go
similarity index 93%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_egress_rule_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_egress_rule_response.go
index ff922a3f..82bb82b7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_egress_rule_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_egress_rule_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// GetEgressRuleResponse GetEgressRuleResponse is the response message to the GetEgressRule RPC..
+// GetEgressRuleResponse struct for GetEgressRuleResponse.
type GetEgressRuleResponse struct {
Rule EgressRule `json:"rule"`
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_group_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_group_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_group_request.go
index 12033abf..bf6e1bc7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_group_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_group_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_request.go
index 5c261a25..229a6107 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_response.go
index dba5abb6..668d5784 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_groups_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_person_users_by_email_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_person_users_by_email_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_person_users_by_email_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_person_users_by_email_response.go
index 95ba161a..0db4de54 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_person_users_by_email_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_person_users_by_email_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_private_endpoint_trusted_owner_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_private_endpoint_trusted_owner_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_private_endpoint_trusted_owner_response.go
index 142964a2..461446e8 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_private_endpoint_trusted_owner_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_private_endpoint_trusted_owner_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_resource_types_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_resource_types_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_resource_types_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_resource_types_response.go
index a26f1a0b..d5bd44c7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_resource_types_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_resource_types_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_schemas_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_schemas_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_schemas_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_schemas_response.go
index 0e6808ff..24ed8c45 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_schemas_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_schemas_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_service_provider_config_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_service_provider_config_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_service_provider_config_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_service_provider_config_response.go
index f80cd9f5..9c53c4de 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_service_provider_config_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_service_provider_config_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_user_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_user_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_user_request.go
index b1565922..76086cf3 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_user_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_user_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_request.go
index 0cafe899..ff35700f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_response.go
index 2c7e1982..02c59796 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_get_users_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice.go
index 48c36624..529fc661 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_adjustment.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_adjustment.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_adjustment.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_adjustment.go
index 7714fb1c..1c891f03 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_adjustment.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_adjustment.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_item.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_item.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_item.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_item.go
index f1c7f9a8..90d1f8b6 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_invoice_item.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_item.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer.go
index fbf6bc36..04070d41 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer_identity_map_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer_identity_map_entry.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go
index 8e40e32a..82063c5a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_jwt_issuer_identity_map_entry.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_keyset_pagination_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_keyset_pagination_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_keyset_pagination_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_keyset_pagination_response.go
index c9225760..c68f2b42 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_keyset_pagination_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_keyset_pagination_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_line_item.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_line_item.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_line_item.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_line_item.go
index 4a4c47ba..c53a1037 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_line_item.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_line_item.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_allowlist_entries_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_allowlist_entries_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_allowlist_entries_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_allowlist_entries_response.go
index 4ead1e0b..dd0336c1 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_allowlist_entries_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_allowlist_entries_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_keys_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_keys_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_keys_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_keys_response.go
index f922f619..2904e773 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_keys_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_keys_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_oidc_config_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_oidc_config_response.go
similarity index 90%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_oidc_config_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_oidc_config_response.go
index 91f1ed20..d95b47e1 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_api_oidc_config_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_oidc_config_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// ListApiOidcConfigResponse list_api_oidc_config_response contains information about all the OIDC providers that can generate JWT tokens that can be used for authentication with the Cockroach Cloud API..
+// ListApiOidcConfigResponse struct for ListApiOidcConfigResponse.
type ListApiOidcConfigResponse struct {
ApiOidcConfigs *[]ApiOidcConfig `json:"api_oidc_configs,omitempty"`
Pagination *KeysetPaginationResponse `json:"pagination,omitempty"`
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_audit_logs_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_audit_logs_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_audit_logs_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_audit_logs_response.go
index db3571ab..721364fb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_audit_logs_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_audit_logs_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_available_regions_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_available_regions_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_available_regions_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_available_regions_response.go
index 6324416e..ba9cd345 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_available_regions_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_available_regions_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_cluster_nodes_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_cluster_nodes_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_cluster_nodes_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_cluster_nodes_response.go
index 54584134..f2023a0a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_cluster_nodes_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_cluster_nodes_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_clusters_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_clusters_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_clusters_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_clusters_response.go
index ea385a3f..080e46a3 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_clusters_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_clusters_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_databases_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_databases_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_databases_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_databases_response.go
index 4e1db202..cbe59500 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_databases_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_databases_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_egress_rules_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_egress_rules_response.go
similarity index 94%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_egress_rules_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_egress_rules_response.go
index ebb7ff9b..f7ef8276 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_egress_rules_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_egress_rules_response.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// ListEgressRulesResponse ListEgressRulesResponse is the output for the ListEgressRules RPC..
+// ListEgressRulesResponse struct for ListEgressRulesResponse.
type ListEgressRulesResponse struct {
Pagination *KeysetPaginationResponse `json:"pagination,omitempty"`
// rules are the egress rules associated with the given CockroachDB cluster.
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_folders_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_folders_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_folders_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_folders_response.go
index 6f4be9d1..6d8bfd95 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_folders_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_folders_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_invoices_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_invoices_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_invoices_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_invoices_response.go
index f1cd7b33..337d39c5 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_invoices_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_invoices_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_jwt_issuers_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_jwt_issuers_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_jwt_issuers_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_jwt_issuers_response.go
index e9f67334..2c8a3153 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_jwt_issuers_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_jwt_issuers_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_major_cluster_versions_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_major_cluster_versions_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_major_cluster_versions_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_major_cluster_versions_response.go
index 70501e18..8c30d80f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_major_cluster_versions_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_major_cluster_versions_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_private_endpoint_trusted_owners_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_private_endpoint_trusted_owners_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_private_endpoint_trusted_owners_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_private_endpoint_trusted_owners_response.go
index 71309a61..bb5bdf53 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_private_endpoint_trusted_owners_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_private_endpoint_trusted_owners_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_role_grants_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_role_grants_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_role_grants_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_role_grants_response.go
index 714f7ccc..45d93c91 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_role_grants_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_role_grants_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_service_accounts_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_service_accounts_response.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_service_accounts_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_service_accounts_response.go
index c6619c78..271e3c6a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_service_accounts_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_service_accounts_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_sql_users_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_sql_users_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_sql_users_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_sql_users_response.go
index e641b2f5..d581f4b4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_list_sql_users_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_sql_users_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_info.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_info.go
index c7bf8475..ae5d3441 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_specification.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_specification.go
index 13ec3d99..4fa91ec4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_cluster_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_group.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_group.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_group.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_group.go
index 19e2db23..0a97fe2f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_group.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_group.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_status.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_status.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_status.go
index 50a60d0c..8eeea22a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_status.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_status.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_type.go
index 3fb5933b..6424d2aa 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_export_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_level_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_level_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_level_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_level_type.go
index 8d4a3886..b30bcea8 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_log_level_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_level_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_maintenance_window.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_maintenance_window.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_maintenance_window.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_maintenance_window.go
index 0f672c98..49760eac 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_maintenance_window.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_maintenance_window.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_metric_export_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_metric_export_status_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_metric_export_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_metric_export_status_type.go
index 8bb2812e..e945796e 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_metric_export_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_metric_export_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_network_visibility_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_network_visibility_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_network_visibility_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_network_visibility_type.go
index 6e845a9d..8b8570cb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_network_visibility_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_network_visibility_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node.go
index 503293a6..d3c79cef 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node_status_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node_status_type.go
index 85c3476d..6afe9d65 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_node_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_operating_system_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_operating_system_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_operating_system_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_operating_system_type.go
index d863c64f..f0be3c9e 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_operating_system_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_operating_system_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization.go
index c64f510f..1652a031 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization_user_role_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization_user_role_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization_user_role_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization_user_role_type.go
index 110878f1..a150fa90 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_organization_user_role_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization_user_role_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_path_segment.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_path_segment.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_path_segment.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_path_segment.go
index 3bdb1878..39e971a0 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_path_segment.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_path_segment.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_person_user_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_person_user_info.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_person_user_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_person_user_info.go
index c3570f1d..dbdfa201 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_person_user_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_person_user_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_plan_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_plan_type.go
similarity index 62%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_plan_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_plan_type.go
index e51045c3..f784cdcc 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_plan_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_plan_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -22,21 +22,21 @@ import (
"fmt"
)
-// PlanType - DEDICATED: A paid plan that offers dedicated hardware in any location. - CUSTOM: A plan option that is used for clusters whose machine configs are not supported in self-service. All INVOICE clusters are under this plan option. - SERVERLESS: A paid plan that runs on shared hardware and caps the users' maximum monthly spending to a user-specified (possibly 0) amount.
+// PlanType - BASIC: The Basic plan includes essential operational features, is available in select regions, and offers on-demand capacity, making it ideal for small teams with unpredictable workloads. - STANDARD: The Standard plan includes standard enterprise security and monitoring features, is available in all supported regions, and offers provisioned pricing, making it the default choice for most CockroachDB production workloads. - ADVANCED: The Advanced plan is ideal for workloads with stringent isolation, compliance, and security requirements such as CMEK, PCI and HIPAA-readiness, and support for dedicated hardware. Customers are advised to have their account team and/or Cockroach Labs Support involved when provisioning Advanced clusters.
type PlanType string
// List of Plan.Type.
const (
- PLANTYPE_DEDICATED PlanType = "DEDICATED"
- PLANTYPE_CUSTOM PlanType = "CUSTOM"
- PLANTYPE_SERVERLESS PlanType = "SERVERLESS"
+ PLANTYPE_BASIC PlanType = "BASIC"
+ PLANTYPE_STANDARD PlanType = "STANDARD"
+ PLANTYPE_ADVANCED PlanType = "ADVANCED"
)
// All allowed values of PlanType enum.
var AllowedPlanTypeEnumValues = []PlanType{
- "DEDICATED",
- "CUSTOM",
- "SERVERLESS",
+ "BASIC",
+ "STANDARD",
+ "ADVANCED",
}
// NewPlanTypeFromValue returns a pointer to a valid PlanType
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection.go
index 8d4d822d..647a9126 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection_status.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection_status.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection_status.go
index 3e2a3e22..094793ea 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connection_status.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection_status.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connections.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connections.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connections.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connections.go
index 72110758..ec9f825f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_connections.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connections.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service.go
index bfd61cad..526e3d3b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service_status_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service_status_type.go
index 33db6346..fa6c5c6d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_service_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_services.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_services.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_services.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_services.go
index 86ba7bba..2cf8fbaa 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_services.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_services.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner.go
index bccbbd1b..a3ceaeb0 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner_type_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner_type_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner_type_type.go
index 1b43dfed..0b7ea6af 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_private_endpoint_trusted_owner_type_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner_type_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_prometheus_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_prometheus_metric_export_info.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_prometheus_metric_export_info.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_prometheus_metric_export_info.go
index af0d75d8..6aa59617 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_prometheus_metric_export_info.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_prometheus_metric_export_info.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_quantity_unit_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go
similarity index 91%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_quantity_unit_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go
index 3cc0763b..f17faaaf 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_quantity_unit_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -29,12 +29,16 @@ type QuantityUnitType string
const (
QUANTITYUNITTYPE_HOURS QuantityUnitType = "HOURS"
QUANTITYUNITTYPE_REQUEST_UNITS QuantityUnitType = "REQUEST_UNITS"
+ QUANTITYUNITTYPE_GIB QuantityUnitType = "GIB"
+ QUANTITYUNITTYPE_GIB_HOURS QuantityUnitType = "GIB_HOURS"
)
// All allowed values of QuantityUnitType enum.
var AllowedQuantityUnitTypeEnumValues = []QuantityUnitType{
"HOURS",
"REQUEST_UNITS",
+ "GIB",
+ "GIB_HOURS",
}
// NewQuantityUnitTypeFromValue returns a pointer to a valid QuantityUnitType
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_region.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_region.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_region.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_region.go
index 437f82be..a66f1600 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_region.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_region.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_release_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_release_type_type.go
new file mode 100644
index 00000000..ac30f694
--- /dev/null
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_release_type_type.go
@@ -0,0 +1,64 @@
+// Copyright 2023 The Cockroach Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+// CockroachDB Cloud API
+// API version: 2024-09-16
+
+package client
+
+import (
+ "fmt"
+)
+
+// ReleaseTypeType the model 'ReleaseTypeType'.
+type ReleaseTypeType string
+
+// List of ReleaseType.Type.
+const (
+ RELEASETYPETYPE_REGULAR ReleaseTypeType = "REGULAR"
+ RELEASETYPETYPE_INNOVATION ReleaseTypeType = "INNOVATION"
+)
+
+// All allowed values of ReleaseTypeType enum.
+var AllowedReleaseTypeTypeEnumValues = []ReleaseTypeType{
+ "REGULAR",
+ "INNOVATION",
+}
+
+// NewReleaseTypeTypeFromValue returns a pointer to a valid ReleaseTypeType
+// for the value passed as argument, or an error if the value passed is not allowed by the enum.
+func NewReleaseTypeTypeFromValue(v string) (*ReleaseTypeType, error) {
+ ev := ReleaseTypeType(v)
+ if ev.IsValid() {
+ return &ev, nil
+ } else {
+ return nil, fmt.Errorf("invalid value '%v' for ReleaseTypeType: valid values are %v", v, AllowedReleaseTypeTypeEnumValues)
+ }
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise.
+func (v ReleaseTypeType) IsValid() bool {
+ for _, existing := range AllowedReleaseTypeTypeEnumValues {
+ if existing == v {
+ return true
+ }
+ }
+ return false
+}
+
+// Ptr returns reference to ReleaseType.Type value.
+func (v ReleaseTypeType) Ptr() *ReleaseTypeType {
+ return &v
+}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_remove_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_remove_private_endpoint_trusted_owner_response.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_remove_private_endpoint_trusted_owner_response.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_remove_private_endpoint_trusted_owner_response.go
index af8e505a..170caf47 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_remove_private_endpoint_trusted_owner_response.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_remove_private_endpoint_trusted_owner_response.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource.go
index 8e19492a..aabf2368 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource_type_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource_type_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource_type_type.go
index 77786223..2282a626 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_resource_type_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource_type_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_authentication_scheme.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_authentication_scheme.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_authentication_scheme.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_authentication_scheme.go
index 5fcb104c..b48bbdd7 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_authentication_scheme.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_authentication_scheme.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_bulk_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_bulk_support.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_bulk_support.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_bulk_support.go
index e614ce58..7cf32be1 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_bulk_support.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_bulk_support.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_change_password_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_change_password_support.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_change_password_support.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_change_password_support.go
index b08086ee..e56f7387 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_change_password_support.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_change_password_support.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_email.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_email.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_email.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_email.go
index 1724b953..c35b83ad 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_email.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_email.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_etag_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_etag_support.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_etag_support.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_etag_support.go
index c5eb5c97..3489b150 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_etag_support.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_etag_support.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_filter_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_filter_support.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_filter_support.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_filter_support.go
index edf0e57c..6e3bcb4a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_filter_support.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_filter_support.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_group.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_group.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_group.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_group.go
index 3c4cb931..d0a133e2 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_group.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_group.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_metadata.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_metadata.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_metadata.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_metadata.go
index 9cf7bd51..1a997c0d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_metadata.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_metadata.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_name.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_name.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_name.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_name.go
index a2217dcb..e25e8d6c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_name.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_name.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource.go
index 24fcdce4..7706d108 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource_type.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource_type.go
index 9fe3119c..494f86fd 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_resource_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema.go
index 65eb93bc..af62195e 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema_attribute.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema_attribute.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema_attribute.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema_attribute.go
index 3d4ac157..58a28eac 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_schema_attribute.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema_attribute.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_sort_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_sort_support.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_sort_support.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_sort_support.go
index 89c38a31..1f5f6c51 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_sort_support.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_sort_support.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_user.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_user.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_user.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_user.go
index 66d9e9aa..e82c1da3 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_scim_user.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_user.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_config.go
similarity index 74%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_config.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_config.go
index 317131c2..9419558a 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_config.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_config.go
@@ -14,26 +14,26 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
// ServerlessClusterConfig struct for ServerlessClusterConfig.
type ServerlessClusterConfig struct {
// routing_id is used to identify the cluster in a connection string.
- RoutingId string `json:"routing_id"`
- // spend_limit is the maximum monthly charge for a cluster, in US cents. We recommend using usage_limits instead, since spend_limit will be deprecated in the future.
- SpendLimit *int32 `json:"spend_limit,omitempty"`
- UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
+ RoutingId string `json:"routing_id"`
+ UpgradeType UpgradeTypeType `json:"upgrade_type"`
+ UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
}
// NewServerlessClusterConfig instantiates a new ServerlessClusterConfig object.
// This constructor will assign default values to properties that have it defined,
// and makes sure properties required by API are set, but the set of arguments
// will change when the set of required properties is changed
-func NewServerlessClusterConfig(routingId string) *ServerlessClusterConfig {
+func NewServerlessClusterConfig(routingId string, upgradeType UpgradeTypeType) *ServerlessClusterConfig {
p := ServerlessClusterConfig{}
p.RoutingId = routingId
+ p.UpgradeType = upgradeType
return &p
}
@@ -60,18 +60,19 @@ func (o *ServerlessClusterConfig) SetRoutingId(v string) {
o.RoutingId = v
}
-// GetSpendLimit returns the SpendLimit field value if set, zero value otherwise.
-func (o *ServerlessClusterConfig) GetSpendLimit() int32 {
- if o == nil || o.SpendLimit == nil {
- var ret int32
+// GetUpgradeType returns the UpgradeType field value.
+func (o *ServerlessClusterConfig) GetUpgradeType() UpgradeTypeType {
+ if o == nil {
+ var ret UpgradeTypeType
return ret
}
- return *o.SpendLimit
+
+ return o.UpgradeType
}
-// SetSpendLimit gets a reference to the given int32 and assigns it to the SpendLimit field.
-func (o *ServerlessClusterConfig) SetSpendLimit(v int32) {
- o.SpendLimit = &v
+// SetUpgradeType sets field value.
+func (o *ServerlessClusterConfig) SetUpgradeType(v UpgradeTypeType) {
+ o.UpgradeType = v
}
// GetUsageLimits returns the UsageLimits field value if set, zero value otherwise.
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_create_specification.go
similarity index 85%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_create_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_create_specification.go
index 38d603fa..78128c1d 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_create_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_create_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -23,10 +23,9 @@ type ServerlessClusterCreateSpecification struct {
// Preview: Specify which region should be made the primary region. This is only applicable to multi-region Serverless clusters. This field is required if you create the cluster in more than one region.
PrimaryRegion *string `json:"primary_region,omitempty"`
// Region values should match the cloud provider's zone code. For example, for Oregon, set region_name to \"us-west2\" for GCP and \"us-west-2\" for AWS.
- Regions []string `json:"regions"`
- // spend_limit is the maximum monthly charge for a cluster, in US cents. We recommend using usage_limits instead, since spend_limit will be deprecated in the future.
- SpendLimit *int32 `json:"spend_limit,omitempty"`
- UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
+ Regions []string `json:"regions"`
+ UpgradeType *UpgradeTypeType `json:"upgrade_type,omitempty"`
+ UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
// WithEmptyIPAllowlist creates a cluster with no entries in the IP Allowlist. By default, Serverless clusters have one IP allowlist entry that opens the cluster to any IP. Set this property to true to ensure the cluster is closed to public traffic by default.
WithEmptyIpAllowlist *bool `json:"with_empty_ip_allowlist,omitempty"`
}
@@ -78,18 +77,18 @@ func (o *ServerlessClusterCreateSpecification) SetRegions(v []string) {
o.Regions = v
}
-// GetSpendLimit returns the SpendLimit field value if set, zero value otherwise.
-func (o *ServerlessClusterCreateSpecification) GetSpendLimit() int32 {
- if o == nil || o.SpendLimit == nil {
- var ret int32
+// GetUpgradeType returns the UpgradeType field value if set, zero value otherwise.
+func (o *ServerlessClusterCreateSpecification) GetUpgradeType() UpgradeTypeType {
+ if o == nil || o.UpgradeType == nil {
+ var ret UpgradeTypeType
return ret
}
- return *o.SpendLimit
+ return *o.UpgradeType
}
-// SetSpendLimit gets a reference to the given int32 and assigns it to the SpendLimit field.
-func (o *ServerlessClusterCreateSpecification) SetSpendLimit(v int32) {
- o.SpendLimit = &v
+// SetUpgradeType gets a reference to the given UpgradeTypeType and assigns it to the UpgradeType field.
+func (o *ServerlessClusterCreateSpecification) SetUpgradeType(v UpgradeTypeType) {
+ o.UpgradeType = &v
}
// GetUsageLimits returns the UsageLimits field value if set, zero value otherwise.
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_update_specification.go
similarity index 80%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_update_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_update_specification.go
index b8febbeb..ffd67423 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_serverless_cluster_update_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_update_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -23,10 +23,9 @@ type ServerlessClusterUpdateSpecification struct {
// Specify which region should be made the primary region. This is only applicable to multi-region Serverless clusters. This field is required if the regions field contains more than one region.
PrimaryRegion *string `json:"primary_region,omitempty"`
// Region values should match the cloud provider's zone code. For example, for Oregon, set region_name to \"us-west2\" for GCP and \"us-west-2\" for AWS. If this field is provided, the cluster's regions will be changed to match this list. Regions cannot currently be removed.
- Regions *[]string `json:"regions,omitempty"`
- // spend_limit is the maximum monthly charge for a cluster, in US cents. We recommend using usage_limits instead, since spend_limit will be deprecated in the future.
- SpendLimit *int32 `json:"spend_limit,omitempty"`
- UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
+ Regions *[]string `json:"regions,omitempty"`
+ UpgradeType *UpgradeTypeType `json:"upgrade_type,omitempty"`
+ UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
}
// NewServerlessClusterUpdateSpecification instantiates a new ServerlessClusterUpdateSpecification object.
@@ -66,18 +65,18 @@ func (o *ServerlessClusterUpdateSpecification) SetRegions(v []string) {
o.Regions = &v
}
-// GetSpendLimit returns the SpendLimit field value if set, zero value otherwise.
-func (o *ServerlessClusterUpdateSpecification) GetSpendLimit() int32 {
- if o == nil || o.SpendLimit == nil {
- var ret int32
+// GetUpgradeType returns the UpgradeType field value if set, zero value otherwise.
+func (o *ServerlessClusterUpdateSpecification) GetUpgradeType() UpgradeTypeType {
+ if o == nil || o.UpgradeType == nil {
+ var ret UpgradeTypeType
return ret
}
- return *o.SpendLimit
+ return *o.UpgradeType
}
-// SetSpendLimit gets a reference to the given int32 and assigns it to the SpendLimit field.
-func (o *ServerlessClusterUpdateSpecification) SetSpendLimit(v int32) {
- o.SpendLimit = &v
+// SetUpgradeType gets a reference to the given UpgradeTypeType and assigns it to the UpgradeType field.
+func (o *ServerlessClusterUpdateSpecification) SetUpgradeType(v UpgradeTypeType) {
+ o.UpgradeType = &v
}
// GetUsageLimits returns the UsageLimits field value if set, zero value otherwise.
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_service_account.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_service_account.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_service_account.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_service_account.go
index 0bd2c897..ebd4e028 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_service_account.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_service_account.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_state_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_state_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_state_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_state_request.go
index 6c77c16e..1821f43e 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_state_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_state_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_status_type.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_status_type.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_status_type.go
index 0774a91b..726eda45 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_aws_endpoint_connection_status_type.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_status_type.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_client_ca_cert_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_client_ca_cert_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_client_ca_cert_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_client_ca_cert_request.go
index 1cd9f41a..1a7dd7ca 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_client_ca_cert_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_client_ca_cert_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_egress_traffic_policy_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_egress_traffic_policy_request.go
similarity index 95%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_egress_traffic_policy_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_egress_traffic_policy_request.go
index 0ab4d693..758af069 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_set_egress_traffic_policy_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_egress_traffic_policy_request.go
@@ -14,11 +14,11 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
-// SetEgressTrafficPolicyRequest SetEgressTrafficPolicyRequest is the input for the SetEgressTrafficPolicy RPC..
+// SetEgressTrafficPolicyRequest struct for SetEgressTrafficPolicyRequest.
type SetEgressTrafficPolicyRequest struct {
// allow_all, if true results in unrestricted egress traffic. If false, egress traffic is set to default-deny and is managed via the Egress Rule Management API.
AllowAll bool `json:"allow_all"`
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_sql_user.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_sql_user.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_sql_user.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_sql_user.go
index f87d7261..418e9b35 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_sql_user.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_sql_user.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_status.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_status.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_status.go
index a8f1f3d0..69bb9461 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_status.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_status.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_api_key_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_api_key_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_api_key_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_api_key_specification.go
index 191da856..47b279c8 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_api_key_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_api_key_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_client_ca_cert_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_client_ca_cert_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_client_ca_cert_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_client_ca_cert_request.go
index 338c7a2d..6ecfd2b5 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_client_ca_cert_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_client_ca_cert_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go
similarity index 90%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cluster_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go
index 864cdd14..c1e6917b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cluster_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
@@ -24,6 +24,7 @@ type UpdateClusterSpecification struct {
DeleteProtection *DeleteProtectionStateType `json:"delete_protection,omitempty"`
// Preview: The parent ID is a folder ID. An empty string or \"root\" represents the root level.
ParentId *string `json:"parent_id,omitempty"`
+ Plan *PlanType `json:"plan,omitempty"`
Serverless *ServerlessClusterUpdateSpecification `json:"serverless,omitempty"`
UpgradeStatus *ClusterUpgradeStatusType `json:"upgrade_status,omitempty"`
}
@@ -79,6 +80,20 @@ func (o *UpdateClusterSpecification) SetParentId(v string) {
o.ParentId = &v
}
+// GetPlan returns the Plan field value if set, zero value otherwise.
+func (o *UpdateClusterSpecification) GetPlan() PlanType {
+ if o == nil || o.Plan == nil {
+ var ret PlanType
+ return ret
+ }
+ return *o.Plan
+}
+
+// SetPlan gets a reference to the given PlanType and assigns it to the Plan field.
+func (o *UpdateClusterSpecification) SetPlan(v PlanType) {
+ o.Plan = &v
+}
+
// GetServerless returns the Serverless field value if set, zero value otherwise.
func (o *UpdateClusterSpecification) GetServerless() ServerlessClusterUpdateSpecification {
if o == nil || o.Serverless == nil {
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cmek_status_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cmek_status_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cmek_status_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cmek_status_request.go
index d31d459c..3c508a53 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_cmek_status_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cmek_status_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request.go
index e8416323..d3b337eb 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request_1.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request_1.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request_1.go
index add694fe..3fd48c1f 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_database_request_1.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request_1.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_folder_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_folder_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_folder_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_folder_specification.go
index 2844447a..6c8dd243 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_folder_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_folder_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_group_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_group_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_group_request.go
index 6e4c0d2f..df9db64c 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_group_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_group_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_jwt_issuer_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_jwt_issuer_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_jwt_issuer_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_jwt_issuer_request.go
index 3e995a98..7334ee5b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_jwt_issuer_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_jwt_issuer_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_service_account_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_service_account_specification.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_service_account_specification.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_service_account_specification.go
index c5ff89e1..004271c4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_service_account_specification.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_service_account_specification.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_sql_user_password_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_sql_user_password_request.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_sql_user_password_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_sql_user_password_request.go
index 4512ff8c..6a996e83 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_sql_user_password_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_sql_user_password_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_user_request.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_user_request.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_user_request.go
index 2de111f3..56d4c0ff 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_update_user_request.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_user_request.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_upgrade_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_upgrade_type_type.go
new file mode 100644
index 00000000..e6c7fe42
--- /dev/null
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_upgrade_type_type.go
@@ -0,0 +1,64 @@
+// Copyright 2023 The Cockroach Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+// CockroachDB Cloud API
+// API version: 2024-09-16
+
+package client
+
+import (
+ "fmt"
+)
+
+// UpgradeTypeType the model 'UpgradeTypeType'.
+type UpgradeTypeType string
+
+// List of UpgradeType.Type.
+const (
+ UPGRADETYPETYPE_MANUAL UpgradeTypeType = "MANUAL"
+ UPGRADETYPETYPE_AUTOMATIC UpgradeTypeType = "AUTOMATIC"
+)
+
+// All allowed values of UpgradeTypeType enum.
+var AllowedUpgradeTypeTypeEnumValues = []UpgradeTypeType{
+ "MANUAL",
+ "AUTOMATIC",
+}
+
+// NewUpgradeTypeTypeFromValue returns a pointer to a valid UpgradeTypeType
+// for the value passed as argument, or an error if the value passed is not allowed by the enum.
+func NewUpgradeTypeTypeFromValue(v string) (*UpgradeTypeType, error) {
+ ev := UpgradeTypeType(v)
+ if ev.IsValid() {
+ return &ev, nil
+ } else {
+ return nil, fmt.Errorf("invalid value '%v' for UpgradeTypeType: valid values are %v", v, AllowedUpgradeTypeTypeEnumValues)
+ }
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise.
+func (v UpgradeTypeType) IsValid() bool {
+ for _, existing := range AllowedUpgradeTypeTypeEnumValues {
+ if existing == v {
+ return true
+ }
+ }
+ return false
+}
+
+// Ptr returns reference to UpgradeType.Type value.
+func (v UpgradeTypeType) Ptr() *UpgradeTypeType {
+ return &v
+}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_usage_limits.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_usage_limits.go
similarity index 56%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_usage_limits.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_usage_limits.go
index 6ff31095..76a9c8b1 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_usage_limits.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_usage_limits.go
@@ -14,63 +14,67 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
// UsageLimits struct for UsageLimits.
type UsageLimits struct {
+ // provisioned_virtual_cpus is the maximum number of vCPUs that the cluster can use. Once this limit is reached, operation latency may increase due to throttling. It is an error for this to be zero.
+ ProvisionedVirtualCpus *int64 `json:"provisioned_virtual_cpus,omitempty,string"`
// request_unit_limit is the maximum number of request units that the cluster can consume during the month. If this limit is exceeded, then the cluster is disabled until the limit is increased, or until the beginning of the next month when more free request units are granted. It is an error for this to be zero.
- RequestUnitLimit int64 `json:"request_unit_limit,string"`
+ RequestUnitLimit *int64 `json:"request_unit_limit,omitempty,string"`
// storage_mib_limit is the maximum number of Mebibytes of storage that the cluster can have at any time during the month. If this limit is exceeded, then the cluster is throttled; only one SQL connection is allowed at a time, with the expectation that it is used to delete data to reduce storage usage. It is an error for this to be zero.
- StorageMibLimit int64 `json:"storage_mib_limit,string"`
+ StorageMibLimit *int64 `json:"storage_mib_limit,omitempty,string"`
}
// NewUsageLimits instantiates a new UsageLimits object.
// This constructor will assign default values to properties that have it defined,
// and makes sure properties required by API are set, but the set of arguments
// will change when the set of required properties is changed
-func NewUsageLimits(requestUnitLimit int64, storageMibLimit int64) *UsageLimits {
+func NewUsageLimits() *UsageLimits {
p := UsageLimits{}
- p.RequestUnitLimit = requestUnitLimit
- p.StorageMibLimit = storageMibLimit
return &p
}
-// NewUsageLimitsWithDefaults instantiates a new UsageLimits object.
-// This constructor will only assign default values to properties that have it defined,
-// but it doesn't guarantee that properties required by API are set
-func NewUsageLimitsWithDefaults() *UsageLimits {
- p := UsageLimits{}
- return &p
+// GetProvisionedVirtualCpus returns the ProvisionedVirtualCpus field value if set, zero value otherwise.
+func (o *UsageLimits) GetProvisionedVirtualCpus() int64 {
+ if o == nil || o.ProvisionedVirtualCpus == nil {
+ var ret int64
+ return ret
+ }
+ return *o.ProvisionedVirtualCpus
}
-// GetRequestUnitLimit returns the RequestUnitLimit field value.
+// SetProvisionedVirtualCpus gets a reference to the given int64 and assigns it to the ProvisionedVirtualCpus field.
+func (o *UsageLimits) SetProvisionedVirtualCpus(v int64) {
+ o.ProvisionedVirtualCpus = &v
+}
+
+// GetRequestUnitLimit returns the RequestUnitLimit field value if set, zero value otherwise.
func (o *UsageLimits) GetRequestUnitLimit() int64 {
- if o == nil {
+ if o == nil || o.RequestUnitLimit == nil {
var ret int64
return ret
}
-
- return o.RequestUnitLimit
+ return *o.RequestUnitLimit
}
-// SetRequestUnitLimit sets field value.
+// SetRequestUnitLimit gets a reference to the given int64 and assigns it to the RequestUnitLimit field.
func (o *UsageLimits) SetRequestUnitLimit(v int64) {
- o.RequestUnitLimit = v
+ o.RequestUnitLimit = &v
}
-// GetStorageMibLimit returns the StorageMibLimit field value.
+// GetStorageMibLimit returns the StorageMibLimit field value if set, zero value otherwise.
func (o *UsageLimits) GetStorageMibLimit() int64 {
- if o == nil {
+ if o == nil || o.StorageMibLimit == nil {
var ret int64
return ret
}
-
- return o.StorageMibLimit
+ return *o.StorageMibLimit
}
-// SetStorageMibLimit sets field value.
+// SetStorageMibLimit gets a reference to the given int64 and assigns it to the StorageMibLimit field.
func (o *UsageLimits) SetStorageMibLimit(v int64) {
- o.StorageMibLimit = v
+ o.StorageMibLimit = &v
}
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_group_role_grant.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_group_role_grant.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_group_role_grant.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_group_role_grant.go
index 99aab6aa..8b40a9e9 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_group_role_grant.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_group_role_grant.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_role_grants.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_role_grants.go
similarity index 98%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_role_grants.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_role_grants.go
index b1ef7c23..c7b23a7b 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/model_user_role_grants.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_role_grants.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/service.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/service.go
similarity index 99%
rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/service.go
rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/service.go
index cd3edf08..001a3cc4 100644
--- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client/service.go
+++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/service.go
@@ -14,7 +14,7 @@
// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
// CockroachDB Cloud API
-// API version: 2023-04-10
+// API version: 2024-09-16
package client
diff --git a/vendor/modules.txt b/vendor/modules.txt
index bfe94f60..c8611d94 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -60,9 +60,9 @@ github.com/cloudflare/circl/math/mlsbset
github.com/cloudflare/circl/sign
github.com/cloudflare/circl/sign/ed25519
github.com/cloudflare/circl/sign/ed448
-# github.com/cockroachdb/cockroach-cloud-sdk-go/v2 v2.0.1
+# github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0
## explicit; go 1.17
-github.com/cockroachdb/cockroach-cloud-sdk-go/v2/pkg/client
+github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew