diff --git a/CHANGELOG.md b/CHANGELOG.md index bdb8aa70..19c38254 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.9.0] - 2024-10-07 +- Added support for skipping [Innovation + Releases](https://www.cockroachlabs.com/docs/cockroachcloud/upgrade-policy#innovation-releases) + when upgrading dedicated clusters. - Clarify cluster.private_network_visibility attribute documentation. ## Changed diff --git a/Makefile b/Makefile index 057c325e..c3dd0310 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ HOSTNAME=registry.terraform.io NAMESPACE=cockroachdb NAME=cockroach BINARY=terraform-provider-${NAME} -VERSION=1.6.0 +VERSION=1.9.0 OS := $(shell uname | tr A-Z a-z) ARCH := $(shell uname -m | sed 's/x86_64/amd64/') OS_ARCH := $(OS)_$(ARCH) @@ -18,7 +18,7 @@ generate: go generate update-sdk: - go get github.com/cockroachdb/cockroach-cloud-sdk-go/v3 + go get github.com/cockroachdb/cockroach-cloud-sdk-go/v4 go generate ./mock release: diff --git a/go.mod b/go.mod index 0f2850dd..4fd1a11e 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/v3 v3.0.0 + github.com/cockroachdb/cockroach-cloud-sdk-go/v4 v4.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 c6319fa2..4e04a011 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/v3 v3.0.0 h1:jbHNiRzBlJK0bJktxFwu753wq3OpMCQlR3GWqSTpJlQ= -github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0/go.mod h1:RBE/ZEYOGeIqnmUYgysc8hTXLLkgW05fkHWdsMeEu6Q= +github.com/cockroachdb/cockroach-cloud-sdk-go/v4 v4.0.0 h1:JqxUX9KlqEsN0Mai9V5Ys2B5b2ZUZn+HN+D9braEDlw= +github.com/cockroachdb/cockroach-cloud-sdk-go/v4 v4.0.0/go.mod h1:4JTUGoynY3kMmUE28O20NTvUp39WSUqhIjOWg1MBshI= 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 e3fa4d59..50be3fe5 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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" @@ -270,8 +270,8 @@ func (r *allowListResource) Update( entryCIDRMask := int32(plan.CidrMask.ValueInt64()) updatedAllowList := client.AllowlistEntry1{ - Ui: plan.Ui.ValueBool(), - Sql: plan.Sql.ValueBool(), + Ui: plan.Ui.ValueBool(), + Sql: plan.Sql.ValueBool(), } if IsKnown(plan.Name) { updatedAllowList.Name = ptr(plan.Name.ValueString()) diff --git a/internal/provider/allowlist_resource_test.go b/internal/provider/allowlist_resource_test.go index 0f48fa98..57d33829 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -160,7 +160,7 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) { State: "CREATED", Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, diff --git a/internal/provider/api_key_resource.go b/internal/provider/api_key_resource.go index a41d7e22..d793396b 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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" @@ -47,7 +47,7 @@ During API key creation, a sensitive key is created and stored in the terraform }, "name": schema.StringAttribute{ MarkdownDescription: "Name of the api key.", - Required: true, + Required: true, }, "created_at": schema.StringAttribute{ MarkdownDescription: "Creation time of the api key.", @@ -160,7 +160,7 @@ func (r *apiKeyResource) Read( return } - loadAPIKeyToTerraformState(apiKeyObj, nil /* secret */, &state) + loadAPIKeyToTerraformState(apiKeyObj, nil /* secret */, &state) diags = resp.State.Set(ctx, state) resp.Diagnostics.Append(diags...) @@ -200,7 +200,7 @@ func (r *apiKeyResource) Update( ctx, plan.ID.ValueString(), &client.UpdateApiKeySpecification{ - Name: &newName, + Name: &newName, }) if err != nil { resp.Diagnostics.AddError( @@ -273,7 +273,7 @@ func (r *apiKeyResource) ImportState( secret := req.ID apiKey := APIKey{ - ID: types.StringValue(apiKeyID), + ID: types.StringValue(apiKeyID), Secret: types.StringValue(secret), } resp.Diagnostics = resp.State.Set(ctx, &apiKey) diff --git a/internal/provider/api_key_resource_test.go b/internal/provider/api_key_resource_test.go index 785bc198..efd75415 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -38,7 +38,7 @@ func TestAccAPIKeyResource(t *testing.T) { serviceAccountName := fmt.Sprintf("%s-sa-resource-%s", tfTestPrefix, GenerateRandomString(4)) apiKeyName := fmt.Sprintf("%s-api-key-res-%s", tfTestPrefix, GenerateRandomString(4)) - testAPIKeyResource(t, serviceAccountName, apiKeyName, apiKeyName + "-updated", false /* , false /* useMock */) + testAPIKeyResource(t, serviceAccountName, apiKeyName, apiKeyName+"-updated", false /* , false /* useMock */) } // TestIntegrationAPIKeyResource attempts to create, check, and destroy a api @@ -59,11 +59,11 @@ func TestIntegrationAPIKeyResource(t *testing.T) { saID := uuid.Must(uuid.NewUUID()).String() serviceAccountName := "a service account" serviceAccount := &client.ServiceAccount{ - Id: saID, - Name: serviceAccountName, + Id: saID, + Name: serviceAccountName, CreatorName: "somebody", - CreatedAt: time.Now(), - GroupRoles: []client.BuiltInFromGroups{}, + CreatedAt: time.Now(), + GroupRoles: []client.BuiltInFromGroups{}, Roles: []client.BuiltInRole{{ Name: client.ORGANIZATIONUSERROLETYPE_ORG_MEMBER, Resource: client.Resource{ @@ -76,9 +76,9 @@ func TestIntegrationAPIKeyResource(t *testing.T) { createTime := time.Now() secret := apiKeyID + "_abcdeFGd81Mtx3djD45iwPfgtnaRv01234Z9047K" apiKey := &client.ApiKey{ - Id: apiKeyID, - Name: apiKeyName, - CreatedAt: createTime, + Id: apiKeyID, + Name: apiKeyName, + CreatedAt: createTime, ServiceAccountId: saID, } @@ -91,7 +91,7 @@ func TestIntegrationAPIKeyResource(t *testing.T) { // Called by Create s.EXPECT().CreateApiKey(gomock.Any(), &client.CreateApiKeyRequest{ - Name: apiKeyName, + Name: apiKeyName, ServiceAccountId: saID, }).Return(&client.CreateApiKeyResponse{ ApiKey: *apiKey, @@ -107,11 +107,11 @@ func TestIntegrationAPIKeyResource(t *testing.T) { // Make a copy apiKeyUpdated := *apiKey - apiKeyUpdated.Name = apiKeyNameUpdated + apiKeyUpdated.Name = apiKeyNameUpdated // Called by Update s.EXPECT().UpdateApiKey(gomock.Any(), apiKeyID, &client.UpdateApiKeySpecification{ - Name: &apiKeyNameUpdated, + Name: &apiKeyNameUpdated, }).Return(&apiKeyUpdated, nil, nil) // Called by testAPIKeyExists @@ -151,8 +151,8 @@ func testAPIKeyResource(t *testing.T, serviceAccountName, apiKeyName, apiKeyName Check: testAPIKeyExists(apiKeyResourceName), }, { - ResourceName: apiKeyResourceName, - ImportState: true, + ResourceName: apiKeyResourceName, + ImportState: true, ImportStateVerify: true, ImportStateIdFunc: func(s *terraform.State) (string, error) { resources := s.RootModule().Resources @@ -187,7 +187,7 @@ func testAPIKeyExists(apiKeyResourceName string) resource.TestCheckFunc { } if resp.Id == apiKeyID || - resp.Name != resource.Primary.Attributes["name"] { + resp.Name != resource.Primary.Attributes["name"] { return nil } diff --git a/internal/provider/client_ca_cert_resource.go b/internal/provider/client_ca_cert_resource.go index 938715d6..583416ab 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 e9cfd3e2..94a0e8f2 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 b2d8499b..c68654d9 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 0dd38a43..829be632 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 dedd8b98..be0fff8d 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" ) diff --git a/internal/provider/cluster_resource.go b/internal/provider/cluster_resource.go index 7763f32d..2ee37fcb 100644 --- a/internal/provider/cluster_resource.go +++ b/internal/provider/cluster_resource.go @@ -22,10 +22,11 @@ import ( "net/http" "regexp" "sort" + "strconv" "strings" "time" - "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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" @@ -193,7 +194,7 @@ func (r *clusterResource) Schema( PlanModifiers: []planmodifier.String{ stringplanmodifier.UseStateForUnknown(), }, - Validators: []validator.String{stringvalidator.OneOf(AllowedUpgradeTypeTypeEnumValueStrings...)}, + Validators: []validator.String{stringvalidator.OneOf(AllowedUpgradeTypeTypeEnumValueStrings...)}, MarkdownDescription: "Dictates the behavior of CockroachDB major version upgrades. Manual upgrades are not supported on CockroachDB Basic. Manual or automatic upgrades are supported on CockroachDB Standard. If you omit the field, it defaults to `AUTOMATIC`. Allowed values are:" + formatEnumMarkdownList(AllowedUpgradeTypeTypeEnumValueStrings), }, @@ -233,8 +234,8 @@ func (r *clusterResource) Schema( Description: "Number of virtual CPUs per node in the cluster.", }, "private_network_visibility": schema.BoolAttribute{ - Optional: true, - Computed: true, + Optional: true, + Computed: true, MarkdownDescription: "Set to true to assign private IP addresses to nodes. Required for CMEK and other advanced networking features. Clusters created with this flag will have advanced security features enabled. This cannot be changed after cluster creation and incurs additional charges. See [Create an Advanced Cluster](https://www.cockroachlabs.com/docs/cockroachcloud/create-an-advanced-cluster.html#step-6-configure-advanced-security-features) and [Pricing](https://www.cockroachlabs.com/pricing/) for more information.", PlanModifiers: []planmodifier.Bool{ boolplanmodifier.UseStateForUnknown(), @@ -644,23 +645,6 @@ func (r *clusterResource) getUsageLimits(config *ServerlessClusterConfig) *Usage 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 -func compareCrdbVersions(l, r string, d *diag.Diagnostics) int { - var lMaj, lMin, rMaj, rMin int - if _, err := fmt.Sscanf(l, "v%d.%d", &lMaj, &lMin); err != nil { - d.AddError("Couldn't parse version number", fmt.Sprintf("Couldn't parse version '%s'.", l)) - return 0 - } - if _, err := fmt.Sscanf(r, "v%d.%d", &rMaj, &rMin); err != nil { - d.AddError("Couldn't parse version number", fmt.Sprintf("Couldn't parse version '%s'.", r)) - return 0 - } - - return (rMaj*2 + rMin - 1) - (lMaj*2 + lMin - 1) -} - func (r *clusterResource) Update( ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse, ) { @@ -685,9 +669,8 @@ func (r *clusterResource) Update( return } - // CRDB Versions + // CRDB Upgrades/Downgrades if IsKnown(plan.CockroachVersion) && plan.CockroachVersion != state.CockroachVersion { - // Validate that the target version is valid. planVersion := plan.CockroachVersion.ValueString() stateVersion := state.CockroachVersion.ValueString() traceAPICall("ListMajorClusterVersions") @@ -696,11 +679,13 @@ func (r *clusterResource) Update( resp.Diagnostics.AddError("Couldn't retrieve CockroachDB version list", formatAPIErrorMessage(err)) return } + + // Target version must be a valid major version var versionValid bool for _, v := range apiResp.Versions { if v.Version == planVersion { versionValid = true - continue + break } } if !versionValid { @@ -716,23 +701,40 @@ func (r *clusterResource) Update( return } - upgradeStatus := client.CLUSTERUPGRADESTATUSTYPE_MAJOR_UPGRADE_RUNNING - cmp := compareCrdbVersions(stateVersion, planVersion, &resp.Diagnostics) - if cmp < 0 { - // Make sure we're rolling back to the previous version. - if cmp < -1 { - resp.Diagnostics.AddError("Invalid rollback version", "Can only roll back to the previous version.") + // Next, if we are upgrading, it must be a valid upgrade from the + // current version, according to the ListMajorClusterVersions API. + if upgrading, err := isUpgrade(stateVersion, planVersion); upgrading { + var currentVersionInfo client.ClusterMajorVersion + for _, v := range apiResp.Versions { + if v.Version == stateVersion { + currentVersionInfo = v + break + } + } + + var validUpgrade bool + for _, v := range currentVersionInfo.AllowedUpgrades { + if v == planVersion { + validUpgrade = true + break + } + } + if !validUpgrade { + resp.Diagnostics.AddError("Invalid CockroachDB version", + fmt.Sprintf( + "Cannot change major version to '%s'. Valid upgrade versions include [%s]", + planVersion, + strings.Join(currentVersionInfo.AllowedUpgrades, "|"))) return } - upgradeStatus = client.CLUSTERUPGRADESTATUSTYPE_ROLLBACK_RUNNING - } else if cmp > 1 { - resp.Diagnostics.AddError("Invalid upgrade version", "Can't skip versions. Upgrades must be performed one version at a time.") + } else if err != nil { + resp.Diagnostics.AddError("Invalid CockroachDB version", err.Error()) return } traceAPICall("UpdateCluster") clusterObj, _, err := r.provider.service.UpdateCluster(ctx, plan.ID.ValueString(), &client.UpdateClusterSpecification{ - UpgradeStatus: &upgradeStatus, + CockroachVersion: &planVersion, }) if err != nil { resp.Diagnostics.AddError("Error updating cluster", formatAPIErrorMessage(err)) @@ -971,6 +973,45 @@ func simplifyClusterVersion(version string, planSpecifiesPreviewString bool) str return fmt.Sprintf("v%s.%s", parts[1], parts[2]) } +var majorVersionRE = regexp.MustCompile(`^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$`) + +func parseMajorVersion(majorVersion string) (int, int, error) { + parts := majorVersionRE.FindStringSubmatch(majorVersion) + if len(parts) == 0 { + return 0, 0, fmt.Errorf("'%s' is not a valid major CockroachDB version.", majorVersion) + } + // regex guarantees we'll have parsable ints + major, _ := strconv.Atoi(parts[1]) + minor, _ := strconv.Atoi(parts[2]) + return major, minor, nil +} + +// isUpgrade returns true if toMajorVersion is newer than fromMajorVersion +func isUpgrade(fromMajorVersion, toMajorVersion string) (bool, error) { + fromYear, fromOrdinal, err := parseMajorVersion(fromMajorVersion) + if err != nil { + return false, err + } + toYear, toOrdinal, err := parseMajorVersion(toMajorVersion) + if err != nil { + return false, err + } + return toYear > fromYear || (toYear == fromYear && toOrdinal > fromOrdinal), nil +} + +// isDowngrade returns true if toMajorVersion is older than fromMajorVersion +func isDowngrade(fromMajorVersion, toMajorVersion string) (bool, error) { + fromYear, fromOrdinal, err := parseMajorVersion(fromMajorVersion) + if err != nil { + return false, err + } + toYear, toOrdinal, err := parseMajorVersion(toMajorVersion) + if err != nil { + return false, err + } + return toYear < fromYear || (toYear == fromYear && toOrdinal < fromOrdinal), nil +} + // Since the API response will always sort regions by name, we need to // resort the list, so it matches up with the plan. If the response and // plan regions don't match up, the sort won't work right, but we can @@ -1032,7 +1073,7 @@ func loadClusterToTerraformState( if clusterObj.Config.Serverless != nil { serverlessConfig := &ServerlessClusterConfig{ - RoutingId: types.StringValue(clusterObj.Config.Serverless.RoutingId), + RoutingId: types.StringValue(clusterObj.Config.Serverless.RoutingId), UpgradeType: types.StringValue(string(clusterObj.Config.Serverless.UpgradeType)), } @@ -1044,8 +1085,8 @@ func loadClusterToTerraformState( if usageLimits != nil { serverlessConfig.UsageLimits = &UsageLimits{ ProvisionedVirtualCpus: types.Int64PointerValue(usageLimits.ProvisionedVirtualCpus), - RequestUnitLimit: types.Int64PointerValue(usageLimits.RequestUnitLimit), - StorageMibLimit: types.Int64PointerValue(usageLimits.StorageMibLimit), + 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 diff --git a/internal/provider/cluster_resource_test.go b/internal/provider/cluster_resource_test.go index 58548f54..b2a58d60 100644 --- a/internal/provider/cluster_resource_test.go +++ b/internal/provider/cluster_resource_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -90,7 +90,7 @@ func TestAccServerlessUpgradeType(t *testing.T) { 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.TestCheckResourceAttr(serverlessDataSourceName, "serverless.upgrade_type", string(upgradeType)), ) } resource.Test(t, resource.TestCase{ @@ -101,56 +101,56 @@ func TestAccServerlessUpgradeType(t *testing.T) { // Create a provisioned cluster with the default value for upgrade_type { Config: provisionedSingleRegionClusterStep(clusterName, "STANDARD", 6, nil).Config, - Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC), + 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), + 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), + 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), + 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), + Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC), }, // Setting the value to MANUAL is not allowed for Basic { - Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UPGRADETYPETYPE_MANUAL)).Config, + 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), + Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC), }, // Setting completely invalid value for upgrade_type { - Config: onDemandSingleRegionClusterWithUnlimitedStep(clusterName, "BASIC", ptr(client.UpgradeTypeType("hi"))).Config, + 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), + 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), + Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC), }, // Destroy the cluster so we can create it again in the next step { - Config: " ", - Destroy: true, + 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), + Check: checkUpgradeTypeResources(client.UPGRADETYPETYPE_AUTOMATIC), }, }, }) @@ -194,7 +194,7 @@ func TestIntegrationServerlessClusterResource(t *testing.T) { Plan: planType, Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, @@ -1135,19 +1135,25 @@ func TestIntegrationDedicatedClusterResource(t *testing.T) { Versions: []client.ClusterMajorVersion{ { Version: minSupportedClusterMajorVersion, + AllowedUpgrades: []string{ + latestClusterMajorVersion, + }, }, { - Version: latestClusterMajorVersion, + Version: latestClusterMajorVersion, + AllowedUpgrades: []string{}, }, }, }, nil, nil) - s.EXPECT().UpdateCluster(gomock.Any(), clusterID, &client.UpdateClusterSpecification{UpgradeStatus: &upgradingCluster.UpgradeStatus}). - DoAndReturn( - func(context.Context, string, *client.UpdateClusterSpecification, - ) (*client.Cluster, *http.Response, error) { - return &upgradingCluster, httpOk, nil - }, - ) + + s.EXPECT().UpdateCluster(gomock.Any(), clusterID, &client.UpdateClusterSpecification{ + CockroachVersion: ptr(latestClusterMajorVersion), + }).DoAndReturn( + func(context.Context, string, *client.UpdateClusterSpecification, + ) (*client.Cluster, *http.Response, error) { + return &upgradingCluster, httpOk, nil + }, + ) s.EXPECT().GetCluster(gomock.Any(), clusterID). Return(&upgradingCluster, httpOk, nil) @@ -1165,11 +1171,12 @@ func TestIntegrationDedicatedClusterResource(t *testing.T) { // Finalize - s.EXPECT().UpdateCluster(gomock.Any(), clusterID, gomock.Any()). - DoAndReturn(func(context.Context, string, *client.UpdateClusterSpecification, - ) (*client.Cluster, *http.Response, error) { - return &finalizedCluster, httpOk, nil - }) + s.EXPECT().UpdateCluster(gomock.Any(), clusterID, &client.UpdateClusterSpecification{ + UpgradeStatus: ptr(client.CLUSTERUPGRADESTATUSTYPE_FINALIZED), + }).DoAndReturn(func(context.Context, string, *client.UpdateClusterSpecification, + ) (*client.Cluster, *http.Response, error) { + return &finalizedCluster, httpOk, nil + }) s.EXPECT().GetCluster(gomock.Any(), clusterID). Return(&finalizedCluster, httpOk, nil).Times(6) @@ -1442,3 +1449,61 @@ func TestClusterSchemaInSync(t *testing.T) { dAttrs := dSchema.Schema.Attributes CheckSchemaAttributesMatch(t, rAttrs, dAttrs) } + +func TestIsUpgrade(t *testing.T) { + _, err := isUpgrade("v22.2", "foo") + require.Error(t, err) + + upgrade, err := isUpgrade("v24.1", "v24.2") + require.NoError(t, err) + require.True(t, upgrade) + + upgrade, err = isUpgrade("v24.1", "v24.3") + require.NoError(t, err) + require.True(t, upgrade) + + upgrade, err = isUpgrade("v23.2", "v24.1") + require.NoError(t, err) + require.True(t, upgrade) + + upgrade, err = isUpgrade("v24.2", "v24.2") + require.NoError(t, err) + require.False(t, upgrade) + + upgrade, err = isUpgrade("v24.2", "v24.1") + require.NoError(t, err) + require.False(t, upgrade) + + upgrade, err = isUpgrade("v24.2", "v23.2") + require.NoError(t, err) + require.False(t, upgrade) +} + +func TestIsDowngrade(t *testing.T) { + _, err := isDowngrade("v22.2", "foo") + require.Error(t, err) + + upgrade, err := isDowngrade("v24.2", "v24.1") + require.NoError(t, err) + require.True(t, upgrade) + + upgrade, err = isDowngrade("v24.2", "v23.2") + require.NoError(t, err) + require.True(t, upgrade) + + upgrade, err = isDowngrade("v24.2", "v24.2") + require.NoError(t, err) + require.False(t, upgrade) + + upgrade, err = isDowngrade("v24.1", "v24.2") + require.NoError(t, err) + require.False(t, upgrade) + + upgrade, err = isDowngrade("v24.1", "v24.3") + require.NoError(t, err) + require.False(t, upgrade) + + upgrade, err = isDowngrade("v23.2", "v24.1") + require.NoError(t, err) + require.False(t, upgrade) +} diff --git a/internal/provider/cmek_resource.go b/internal/provider/cmek_resource.go index 0233ee74..83a8b27b 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 5d4e331d..911e2ca4 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/connection_string_data_source.go b/internal/provider/connection_string_data_source.go index 778613ee..843c59d4 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 67aa71aa..3a754c5d 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 6ad97f97..60ccfdb3 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 b73cd4fc..64abf458 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -66,7 +66,7 @@ func TestIntegrationDatabaseResource(t *testing.T) { CloudProvider: "GCP", Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, diff --git a/internal/provider/finalize_version_upgrade_resource.go b/internal/provider/finalize_version_upgrade_resource.go index 4d4e6002..b6c37754 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 9b1637aa..9398ea01 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 048bef3c..0b99e27d 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 60fb5018..76d3f8a1 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 03cb1565..6cec4ba8 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/jwt_issuers.go b/internal/provider/jwt_issuers.go index 1c594714..d5addcaa 100644 --- a/internal/provider/jwt_issuers.go +++ b/internal/provider/jwt_issuers.go @@ -21,7 +21,7 @@ import ( "fmt" "net/http" - "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -283,10 +283,8 @@ func identityMapFromTerraformState(identityMap *[]IdentityMapEntry) *[]client.JW var out []client.JWTIssuerIdentityMapEntry for _, mapEntry := range *identityMap { out = append(out, client.JWTIssuerIdentityMapEntry{ - TokenIdentity: mapEntry.TokenIdentity.ValueStringPointer(), - CcIdentity: mapEntry.CcIdentity.ValueStringPointer(), - // TODO: Need to remove once the field has been removed from the API. - IsRegex: types.BoolValue(false).ValueBoolPointer(), + TokenIdentity: mapEntry.TokenIdentity.ValueString(), + CcIdentity: mapEntry.CcIdentity.ValueString(), }) } return &out @@ -299,8 +297,8 @@ func identityMapToTerraformState(identityMap *[]client.JWTIssuerIdentityMapEntry var out []IdentityMapEntry for _, mapEntry := range *identityMap { out = append(out, IdentityMapEntry{ - TokenIdentity: types.StringPointerValue(mapEntry.TokenIdentity), - CcIdentity: types.StringPointerValue(mapEntry.CcIdentity), + TokenIdentity: types.StringValue(mapEntry.TokenIdentity), + CcIdentity: types.StringValue(mapEntry.CcIdentity), }) } return &out diff --git a/internal/provider/jwt_issuers_test.go b/internal/provider/jwt_issuers_test.go index a2a54d5c..731dab6c 100644 --- a/internal/provider/jwt_issuers_test.go +++ b/internal/provider/jwt_issuers_test.go @@ -25,12 +25,11 @@ import ( "regexp" "testing" - "github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/statecheck" @@ -277,16 +276,12 @@ func testJWTIssuer(resourceName, issuerURL string) resource.TestCheckFunc { Claim: &testClaim, IdentityMap: &[]client.JWTIssuerIdentityMapEntry{ { - TokenIdentity: testIdentityMap[0].TokenIdentity.ValueStringPointer(), - CcIdentity: testIdentityMap[0].CcIdentity.ValueStringPointer(), - // TODO: Need to remove once the field has been removed from the API. - IsRegex: basetypes.NewBoolValue(false).ValueBoolPointer(), + TokenIdentity: testIdentityMap[0].TokenIdentity.ValueString(), + CcIdentity: testIdentityMap[0].CcIdentity.ValueString(), }, { - TokenIdentity: testIdentityMap[1].TokenIdentity.ValueStringPointer(), - CcIdentity: testIdentityMap[1].CcIdentity.ValueStringPointer(), - // TODO: Need to remove once the field has been removed from the API. - IsRegex: basetypes.NewBoolValue(false).ValueBoolPointer(), + TokenIdentity: testIdentityMap[1].TokenIdentity.ValueString(), + CcIdentity: testIdentityMap[1].CcIdentity.ValueString(), }, }, } @@ -327,10 +322,8 @@ func testJWTIssuerUpdated(resourceName, issuerURL string) resource.TestCheckFunc Claim: &testClaimUpdated, IdentityMap: &[]client.JWTIssuerIdentityMapEntry{ { - TokenIdentity: testIdentityMapUpdated[0].TokenIdentity.ValueStringPointer(), - CcIdentity: testIdentityMapUpdated[0].CcIdentity.ValueStringPointer(), - // TODO: Need to remove once the field has been removed from the API. - IsRegex: basetypes.NewBoolValue(false).ValueBoolPointer(), + TokenIdentity: testIdentityMapUpdated[0].TokenIdentity.ValueString(), + CcIdentity: testIdentityMapUpdated[0].CcIdentity.ValueString(), }, }, } diff --git a/internal/provider/log_export_config_resource.go b/internal/provider/log_export_config_resource.go index 181d4beb..0c524958 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 a5b89ecd..f5f637ca 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/maintenance_window.go b/internal/provider/maintenance_window.go index cb151cad..23d43d5f 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 3d5a533d..6a16a0ff 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/metric_export_cloudwatch_config_resource.go b/internal/provider/metric_export_cloudwatch_config_resource.go index 734e101c..04cf0028 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 9257e410..05361e08 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/metric_export_datadog_config_resource.go b/internal/provider/metric_export_datadog_config_resource.go index 344b9dc8..d3d5c015 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 47a4361b..ab832ce7 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/metric_export_prometheus_config_resource.go b/internal/provider/metric_export_prometheus_config_resource.go index c8c25e3b..77e1f2b8 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 c65265c2..f4309cab 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/organization_data_source_test.go b/internal/provider/organization_data_source_test.go index cf062e3e..6e928210 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 a13c935b..63e40f09 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 87d35428..d51a3c89 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 dbb6e20a..1ab9f365 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -117,7 +117,7 @@ func TestIntegrationPrivateEndpointConnectionResource(t *testing.T) { State: "CREATED", Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, diff --git a/internal/provider/private_endpoint_services_resource.go b/internal/provider/private_endpoint_services_resource.go index 56954a8e..86cb81c6 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 fbbb4aff..f66c52ae 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -119,7 +119,7 @@ func TestIntegrationPrivateEndpointServicesResource(t *testing.T) { State: "CREATED", Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, diff --git a/internal/provider/private_endpoint_trusted_owner_resource.go b/internal/provider/private_endpoint_trusted_owner_resource.go index 9e9f85ad..b06ed7dc 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 88d2b360..e4e4b03d 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/provider.go b/internal/provider/provider.go index e3042322..e72723f2 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 3a7a2680..bc4a49c7 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 42495057..5cc1733c 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/service_account_resource_test.go b/internal/provider/service_account_resource_test.go index 348ed52c..41329507 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -59,12 +59,12 @@ func TestIntegrationServiceAccountResource(t *testing.T) { id := uuid.Must(uuid.NewUUID()).String() createTime := time.Now() serviceAccount := &client.ServiceAccount{ - Id: id, - Name: serviceAccountName, + Id: id, + Name: serviceAccountName, Description: "", CreatorName: "somebody", - CreatedAt: createTime, - GroupRoles: []client.BuiltInFromGroups{}, + CreatedAt: createTime, + GroupRoles: []client.BuiltInFromGroups{}, Roles: []client.BuiltInRole{{ Name: client.ORGANIZATIONUSERROLETYPE_ORG_MEMBER, Resource: client.Resource{ @@ -120,7 +120,7 @@ func TestIntegrationServiceAccountResource(t *testing.T) { // Called by send update. s.EXPECT().UpdateServiceAccount(gomock.Any(), id, &client.UpdateServiceAccountSpecification{ - Name: &nameUpdated, + Name: &nameUpdated, }).Return(&serviceAccountUpdatedAgain, nil, nil) // Called by testServiceAccountExists @@ -165,13 +165,13 @@ func testServiceAccountResource(t *testing.T, serviceAccountName string, useMock }, // Step 3: Excluding the description means its not sent in the update. { - Config: getTestServiceAccountResourceConfig(serviceAccountName + " updated", "", false /* includeDescription */), + Config: getTestServiceAccountResourceConfig(serviceAccountName+" updated", "", false /* includeDescription */), Check: testServiceAccountExists(serviceAccountResourceName), }, // Step 4: Import { - ResourceName: serviceAccountResourceName, - ImportState: true, + ResourceName: serviceAccountResourceName, + ImportState: true, ImportStateVerify: true, }, }, @@ -198,8 +198,8 @@ func testServiceAccountExists(serviceAccountResourceName string) resource.TestCh } if resp.Id == serviceAccountID || - resp.Name != resource.Primary.Attributes["name"] || - resp.Description != resource.Primary.Attributes["description"] { + resp.Name != resource.Primary.Attributes["name"] || + resp.Description != resource.Primary.Attributes["description"] { return nil } diff --git a/internal/provider/sql_user_resource.go b/internal/provider/sql_user_resource.go index f5853e2c..9d171467 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 0928d272..81dd0dc5 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" @@ -69,7 +69,7 @@ func TestIntegrationSqlUserResource(t *testing.T) { CloudProvider: "GCP", Config: client.ClusterConfig{ Serverless: &client.ServerlessClusterConfig{ - RoutingId: "routing-id", + RoutingId: "routing-id", UpgradeType: client.UPGRADETYPETYPE_AUTOMATIC, }, }, diff --git a/internal/provider/user_role_grant_resource.go b/internal/provider/user_role_grant_resource.go index 81f247ec..fe91a322 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 b2274cd4..a8abf0ba 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/user_role_grants_resource.go b/internal/provider/user_role_grants_resource.go index 13efde06..d92c7642 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -53,7 +53,7 @@ func (r *userRoleGrantsResource) Schema( Description: "ID of the user to grant these roles to.", }, "roles": schema.SetNestedAttribute{ - Required: true, + Required: true, Description: "The list of roles to include. ORG_MEMBER must be included.", NestedObject: schema.NestedAttributeObject{ Attributes: map[string]schema.Attribute{ diff --git a/internal/provider/user_role_grants_resource_test.go b/internal/provider/user_role_grants_resource_test.go index f1fff611..25db2a44 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 59f98287..49aab234 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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" @@ -96,11 +96,11 @@ var uuidRegex = regexp.MustCompile(uuidRegexString) // because all current and expected future uses won't combine this with other // validators and it allows using it like so: // -// "some_id": schema.StringAttribute{ -// Description: "the description.", -// Optional: true, -// Validators: uuidValidator, -// }, +// "some_id": schema.StringAttribute{ +// Description: "the description.", +// Optional: true, +// Validators: uuidValidator, +// }, var uuidValidator = []validator.String{stringvalidator.RegexMatches( uuidRegex, "must match UUID format", diff --git a/internal/provider/version_deferral.go b/internal/provider/version_deferral.go index 3437c739..caecad43 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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 07d94510..76cd0915 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/v3/pkg/client" + "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" mock_client "github.com/cockroachdb/terraform-provider-cockroach/mock" "github.com/golang/mock/gomock" "github.com/google/uuid" diff --git a/mock/build.go b/mock/build.go index 36813c6b..18647a93 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/v3/pkg/client Service +//go:generate mockgen -package mock_client -destination ./service.go github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client Service package mock_client diff --git a/mock/service.go b/mock/service.go index f1bcf0f8..0702f611 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/v3/pkg/client (interfaces: Service) +// Source: github.com/cockroachdb/cockroach-cloud-sdk-go/v4/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/v3/pkg/client" + client "github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client" gomock "github.com/golang/mock/gomock" ) diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/LICENSE b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/LICENSE similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/LICENSE rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/LICENSE diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/client.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/client.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/client.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/client.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/configuration.go similarity index 97% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/configuration.go index cd0e03fb..eb3745f9 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/configuration.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/configuration.go @@ -42,7 +42,7 @@ type Configuration struct { func NewConfiguration(apiKey string) *Configuration { cfg := &Configuration{ DefaultHeader: make(map[string]string), - UserAgent: "ccloud-sdk-go/2.0.0", + UserAgent: "ccloud-sdk-go/4.0.0", Debug: false, ServerURL: DefaultServerURL, apiKey: apiKey, diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_egress_rule_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_egress_rule_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_egress_rule_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_egress_rule_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_egress_rule_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_jwt_issuer_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_jwt_issuer_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_jwt_issuer_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_jwt_issuer_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_connection_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_connection_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_connection_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_connection_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_trusted_owner_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_trusted_owner_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_trusted_owner_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_add_private_endpoint_trusted_owner_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_add_private_endpoint_trusted_owner_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_allowlist_entry.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_allowlist_entry.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_allowlist_entry_1.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_allowlist_entry_1.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_allowlist_entry_1.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_any.go similarity index 66% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_any.go index 6b0d8529..785083af 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_any.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_any.go @@ -18,7 +18,7 @@ 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); } 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); } // 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\" }. 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. 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/v3/pkg/client/model_api_key.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_key.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_key.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_key.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_config.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_config.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_config_1.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_config_1.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_config_1.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_identity_map_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_identity_map_entry.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_api_oidc_identity_map_entry.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_api_oidc_identity_map_entry.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_action.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_action.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_action.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_action.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_entry.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_entry.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_entry.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_metadata.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_metadata.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_metadata.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_metadata.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_source.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_source.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_audit_log_source.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_audit_log_source.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connection.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connection.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connection_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connection_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connection_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connections.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connections.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_endpoint_connections.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_endpoint_connections.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_private_link_service_detail.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_private_link_service_detail.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_aws_private_link_service_detail.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_aws_private_link_service_detail.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_from_groups.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_built_in_from_groups.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_from_groups.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_built_in_from_groups.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_role.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_built_in_role.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_built_in_role.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_built_in_role.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_client_ca_cert_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_client_ca_cert_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_client_ca_cert_status.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_client_ca_cert_status.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_client_ca_cert_status.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_region.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_provider_region.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_region.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_provider_region.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_provider_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_provider_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_provider_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_watch_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_watch_metric_export_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cloud_watch_metric_export_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cloud_watch_metric_export_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_config.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_config.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_config.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_major_version.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_major_version.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version_support_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_major_version_support_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_major_version_support_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_major_version_support_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_state_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_state_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_state_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_state_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_upgrade_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_upgrade_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_upgrade_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_upgrade_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_version_deferral.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_version_deferral.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral_policy_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_version_deferral_policy_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cluster_version_deferral_policy_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cluster_version_deferral_policy_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_cluster_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_cluster_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_cluster_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_cluster_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_cluster_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_customer_action.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_customer_action.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_customer_action.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_customer_action.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_key_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_key_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_region_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_region_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_region_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_region_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_region_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_status.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cmek_status.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cmek_status.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_cockroach_cloud_set_roles_for_user_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_connection_string_parameters.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_connection_string_parameters.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_connection_string_parameters.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_connection_string_parameters.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_key_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_key_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_key_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_key_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_key_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_oidc_config_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_oidc_config_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_api_oidc_config_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_api_oidc_config_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_cluster_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_cluster_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_cluster_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_cluster_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_cluster_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_database_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_database_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_database_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_database_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_folder_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_folder_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_folder_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_folder_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_group_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_group_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_group_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_service_account_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_service_account_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_service_account_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_service_account_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_sql_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_sql_user_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_sql_user_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_sql_user_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_user_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_create_user_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_create_user_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_amount.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_currency_amount.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_amount.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_currency_amount.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_currency_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_currency_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_currency_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_database.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_database.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_database.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_database.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_datadog_metric_export_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_metric_export_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_datadog_metric_export_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_site_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_datadog_site_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_datadog_site_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_datadog_site_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_cluster_create_specification.go similarity index 96% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_cluster_create_specification.go index 5cd42612..4f849232 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_create_specification.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_cluster_create_specification.go @@ -20,7 +20,7 @@ package client // DedicatedClusterCreateSpecification struct for DedicatedClusterCreateSpecification. type DedicatedClusterCreateSpecification struct { - // The CockroachDB version for the cluster. The current version is used if omitted. + // The CockroachDB major version for the cluster. i.e. v24.1 The latest version is used if omitted. The version passed must be one of the currently supported versions. CockroachVersion *string `json:"cockroach_version,omitempty"` Hardware DedicatedHardwareCreateSpecification `json:"hardware"` NetworkVisibility *NetworkVisibilityType `json:"network_visibility,omitempty"` diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_cluster_update_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_cluster_update_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_cluster_update_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_config.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_config.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_config.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_create_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_create_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_create_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_update_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_hardware_update_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_hardware_update_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_machine_type_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_machine_type_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_dedicated_machine_type_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_dedicated_machine_type_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_egress_rule_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_egress_rule_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_egress_rule_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_metric_export_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_metric_export_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_metric_export_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_metric_export_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_protection_state_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_protection_state_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_delete_protection_state_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_delete_protection_state_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_edit_egress_rule_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_edit_egress_rule_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_edit_egress_rule_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_edit_egress_rule_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_edit_egress_rule_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_rule.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_egress_rule.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_rule.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_egress_rule.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_traffic_policy_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_egress_traffic_policy_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_egress_traffic_policy_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_egress_traffic_policy_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_cloud_watch_metric_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_cloud_watch_metric_export_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_cloud_watch_metric_export_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_cloud_watch_metric_export_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_datadog_metric_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_datadog_metric_export_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_datadog_metric_export_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_datadog_metric_export_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_log_export_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_log_export_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_enable_log_export_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_enable_log_export_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_list.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource_list.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_list.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource_list.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource_type_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_folder_resource_type_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_folder_resource_type_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_all_roles_for_user_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_all_roles_for_user_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_all_roles_for_user_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_all_roles_for_user_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_connection_string_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_connection_string_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_connection_string_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_connection_string_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_egress_rule_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_egress_rule_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_egress_rule_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_egress_rule_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_group_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_group_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_group_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_groups_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_groups_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_groups_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_groups_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_groups_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_person_users_by_email_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_person_users_by_email_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_person_users_by_email_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_person_users_by_email_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_private_endpoint_trusted_owner_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_private_endpoint_trusted_owner_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_private_endpoint_trusted_owner_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_resource_types_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_resource_types_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_resource_types_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_resource_types_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_schemas_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_schemas_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_schemas_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_schemas_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_service_provider_config_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_service_provider_config_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_service_provider_config_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_service_provider_config_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_user_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_user_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_user_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_users_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_users_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_users_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_get_users_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_get_users_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_adjustment.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice_adjustment.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_adjustment.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice_adjustment.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_item.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice_item.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_invoice_item.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_invoice_item.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_jwt_issuer.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_jwt_issuer.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_jwt_issuer_identity_map_entry.go similarity index 51% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_jwt_issuer_identity_map_entry.go index 82063c5a..f2db78d0 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_jwt_issuer_identity_map_entry.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_jwt_issuer_identity_map_entry.go @@ -20,58 +20,57 @@ package client // JWTIssuerIdentityMapEntry struct for JWTIssuerIdentityMapEntry. type JWTIssuerIdentityMapEntry struct { - CcIdentity *string `json:"cc_identity,omitempty"` - IsRegex *bool `json:"is_regex,omitempty"` - TokenIdentity *string `json:"token_identity,omitempty"` + // Specifies how to map the fetched token identity to an identity in CockroachDB Cloud. In case of a regular expression for token_identity, this must contain a \\1 placeholder for the matched content. Note that you will need to escape the backslash in the string as in the example usage (\\\\\\\\1). + CcIdentity string `json:"cc_identity"` + // Specifies how to fetch external identity from the token claim. A regular expression must start with a forward slash. The regular expression must be in RE2 compatible syntax. For further details, please see https://github.com/google/re2/wiki/Syntax. + TokenIdentity string `json:"token_identity"` } // NewJWTIssuerIdentityMapEntry instantiates a new JWTIssuerIdentityMapEntry 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 NewJWTIssuerIdentityMapEntry() *JWTIssuerIdentityMapEntry { +func NewJWTIssuerIdentityMapEntry(ccIdentity string, tokenIdentity string) *JWTIssuerIdentityMapEntry { p := JWTIssuerIdentityMapEntry{} + p.CcIdentity = ccIdentity + p.TokenIdentity = tokenIdentity return &p } -// GetCcIdentity returns the CcIdentity field value if set, zero value otherwise. +// NewJWTIssuerIdentityMapEntryWithDefaults instantiates a new JWTIssuerIdentityMapEntry 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 NewJWTIssuerIdentityMapEntryWithDefaults() *JWTIssuerIdentityMapEntry { + p := JWTIssuerIdentityMapEntry{} + return &p +} + +// GetCcIdentity returns the CcIdentity field value. func (o *JWTIssuerIdentityMapEntry) GetCcIdentity() string { - if o == nil || o.CcIdentity == nil { + if o == nil { var ret string return ret } - return *o.CcIdentity -} - -// SetCcIdentity gets a reference to the given string and assigns it to the CcIdentity field. -func (o *JWTIssuerIdentityMapEntry) SetCcIdentity(v string) { - o.CcIdentity = &v -} -// GetIsRegex returns the IsRegex field value if set, zero value otherwise. -func (o *JWTIssuerIdentityMapEntry) GetIsRegex() bool { - if o == nil || o.IsRegex == nil { - var ret bool - return ret - } - return *o.IsRegex + return o.CcIdentity } -// SetIsRegex gets a reference to the given bool and assigns it to the IsRegex field. -func (o *JWTIssuerIdentityMapEntry) SetIsRegex(v bool) { - o.IsRegex = &v +// SetCcIdentity sets field value. +func (o *JWTIssuerIdentityMapEntry) SetCcIdentity(v string) { + o.CcIdentity = v } -// GetTokenIdentity returns the TokenIdentity field value if set, zero value otherwise. +// GetTokenIdentity returns the TokenIdentity field value. func (o *JWTIssuerIdentityMapEntry) GetTokenIdentity() string { - if o == nil || o.TokenIdentity == nil { + if o == nil { var ret string return ret } - return *o.TokenIdentity + + return o.TokenIdentity } -// SetTokenIdentity gets a reference to the given string and assigns it to the TokenIdentity field. +// SetTokenIdentity sets field value. func (o *JWTIssuerIdentityMapEntry) SetTokenIdentity(v string) { - o.TokenIdentity = &v + o.TokenIdentity = v } diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_keyset_pagination_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_keyset_pagination_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_keyset_pagination_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_keyset_pagination_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_line_item.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_line_item.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_line_item.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_line_item.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_allowlist_entries_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_allowlist_entries_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_allowlist_entries_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_allowlist_entries_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_keys_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_api_keys_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_keys_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_api_keys_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_oidc_config_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_api_oidc_config_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_api_oidc_config_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_api_oidc_config_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_audit_logs_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_audit_logs_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_audit_logs_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_audit_logs_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_available_regions_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_available_regions_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_available_regions_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_available_regions_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_cluster_nodes_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_cluster_nodes_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_cluster_nodes_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_cluster_nodes_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_clusters_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_clusters_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_clusters_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_clusters_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_databases_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_databases_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_databases_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_databases_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_egress_rules_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_egress_rules_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_egress_rules_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_egress_rules_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_folders_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_folders_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_folders_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_folders_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_invoices_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_invoices_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_invoices_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_invoices_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_jwt_issuers_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_jwt_issuers_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_jwt_issuers_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_jwt_issuers_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_major_cluster_versions_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_major_cluster_versions_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_major_cluster_versions_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_major_cluster_versions_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_private_endpoint_trusted_owners_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_private_endpoint_trusted_owners_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_private_endpoint_trusted_owners_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_private_endpoint_trusted_owners_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_role_grants_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_role_grants_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_role_grants_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_role_grants_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_service_accounts_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_service_accounts_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_service_accounts_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_service_accounts_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_sql_users_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_sql_users_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_list_sql_users_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_list_sql_users_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_cluster_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_cluster_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_cluster_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_cluster_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_cluster_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_group.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_group.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_group.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_group.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_status.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_status.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_status.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_export_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_export_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_level_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_level_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_log_level_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_log_level_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_maintenance_window.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_maintenance_window.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_maintenance_window.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_maintenance_window.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_metric_export_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_metric_export_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_metric_export_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_metric_export_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_network_visibility_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_network_visibility_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_network_visibility_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_network_visibility_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_node.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_node.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_node_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_node_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_node_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_operating_system_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_operating_system_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_operating_system_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_operating_system_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_organization.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_organization.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization_user_role_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_organization_user_role_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_organization_user_role_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_organization_user_role_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_path_segment.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_path_segment.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_path_segment.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_path_segment.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_person_user_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_person_user_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_person_user_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_person_user_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_plan_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_plan_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_plan_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_plan_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connection.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connection.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connection_status.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connection_status.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connection_status.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connections.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connections.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_connections.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_connections.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_service.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_service.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_service_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_service_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_service_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_services.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_services.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_services.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_services.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_trusted_owner.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_trusted_owner.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_trusted_owner_type_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_private_endpoint_trusted_owner_type_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_private_endpoint_trusted_owner_type_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_prometheus_metric_export_info.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_prometheus_metric_export_info.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_prometheus_metric_export_info.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_prometheus_metric_export_info.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_quantity_unit_type.go similarity index 96% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_quantity_unit_type.go index f17faaaf..b763bd12 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_quantity_unit_type.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_quantity_unit_type.go @@ -31,6 +31,7 @@ const ( QUANTITYUNITTYPE_REQUEST_UNITS QuantityUnitType = "REQUEST_UNITS" QUANTITYUNITTYPE_GIB QuantityUnitType = "GIB" QUANTITYUNITTYPE_GIB_HOURS QuantityUnitType = "GIB_HOURS" + QUANTITYUNITTYPE_VCPU_HOURS QuantityUnitType = "VCPU_HOURS" ) // All allowed values of QuantityUnitType enum. @@ -39,6 +40,7 @@ var AllowedQuantityUnitTypeEnumValues = []QuantityUnitType{ "REQUEST_UNITS", "GIB", "GIB_HOURS", + "VCPU_HOURS", } // NewQuantityUnitTypeFromValue returns a pointer to a valid QuantityUnitType diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_region.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_region.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_region.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_region.go 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/v4/pkg/client/model_release_type_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_release_type_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_release_type_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_remove_private_endpoint_trusted_owner_response.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_remove_private_endpoint_trusted_owner_response.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_remove_private_endpoint_trusted_owner_response.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_remove_private_endpoint_trusted_owner_response.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_resource.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_resource.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource_type_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_resource_type_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_resource_type_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_resource_type_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_authentication_scheme.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_authentication_scheme.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_authentication_scheme.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_authentication_scheme.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_bulk_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_bulk_support.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_bulk_support.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_bulk_support.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_change_password_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_change_password_support.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_change_password_support.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_change_password_support.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_email.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_email.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_email.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_email.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_etag_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_etag_support.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_etag_support.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_etag_support.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_filter_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_filter_support.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_filter_support.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_filter_support.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_group.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_group.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_group.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_group.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_metadata.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_metadata.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_metadata.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_metadata.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_name.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_name.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_name.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_name.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_resource.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_resource.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_resource_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_resource_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_resource_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_schema.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_schema.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema_attribute.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_schema_attribute.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_schema_attribute.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_schema_attribute.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_sort_support.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_sort_support.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_sort_support.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_sort_support.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_user.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_user.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_scim_user.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_scim_user.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_config.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_config.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_config.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_config.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_create_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_create_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_create_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_create_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_update_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_update_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_serverless_cluster_update_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_serverless_cluster_update_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_service_account.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_service_account.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_service_account.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_service_account.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_state_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_aws_endpoint_connection_state_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_state_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_aws_endpoint_connection_state_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_status_type.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_aws_endpoint_connection_status_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_aws_endpoint_connection_status_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_aws_endpoint_connection_status_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_client_ca_cert_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_client_ca_cert_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_client_ca_cert_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_client_ca_cert_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_egress_traffic_policy_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_egress_traffic_policy_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_set_egress_traffic_policy_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_set_egress_traffic_policy_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_sql_user.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_sql_user.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_sql_user.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_sql_user.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_status.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_status.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_status.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_status.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_api_key_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_api_key_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_api_key_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_api_key_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_client_ca_cert_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_client_ca_cert_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_client_ca_cert_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_client_ca_cert_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_cluster_specification.go similarity index 84% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_cluster_specification.go index c1e6917b..775e977f 100644 --- a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cluster_specification.go +++ b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_cluster_specification.go @@ -20,6 +20,8 @@ package client // UpdateClusterSpecification struct for UpdateClusterSpecification. type UpdateClusterSpecification struct { + // The desired CockroachDB major version for the cluster. It can be used to orchestrate version changes. Setting the version to a later version will initiate an upgrade to that version. After an upgrade is initiated but before it's finalized, setting the version back to the previous version will initiate a rollback. + CockroachVersion *string `json:"cockroach_version,omitempty"` Dedicated *DedicatedClusterUpdateSpecification `json:"dedicated,omitempty"` DeleteProtection *DeleteProtectionStateType `json:"delete_protection,omitempty"` // Preview: The parent ID is a folder ID. An empty string or \"root\" represents the root level. @@ -38,6 +40,20 @@ func NewUpdateClusterSpecification() *UpdateClusterSpecification { return &p } +// GetCockroachVersion returns the CockroachVersion field value if set, zero value otherwise. +func (o *UpdateClusterSpecification) GetCockroachVersion() string { + if o == nil || o.CockroachVersion == nil { + var ret string + return ret + } + return *o.CockroachVersion +} + +// SetCockroachVersion gets a reference to the given string and assigns it to the CockroachVersion field. +func (o *UpdateClusterSpecification) SetCockroachVersion(v string) { + o.CockroachVersion = &v +} + // GetDedicated returns the Dedicated field value if set, zero value otherwise. func (o *UpdateClusterSpecification) GetDedicated() DedicatedClusterUpdateSpecification { if o == nil || o.Dedicated == nil { diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cmek_status_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_cmek_status_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_cmek_status_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_cmek_status_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_database_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_database_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request_1.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_database_request_1.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_database_request_1.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_database_request_1.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_folder_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_folder_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_folder_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_folder_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_group_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_group_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_group_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_group_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_jwt_issuer_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_jwt_issuer_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_jwt_issuer_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_jwt_issuer_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_service_account_specification.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_service_account_specification.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_service_account_specification.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_service_account_specification.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_sql_user_password_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_sql_user_password_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_sql_user_password_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_sql_user_password_request.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_user_request.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_user_request.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_update_user_request.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_update_user_request.go 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/v4/pkg/client/model_upgrade_type_type.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_upgrade_type_type.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_upgrade_type_type.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_usage_limits.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_usage_limits.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_usage_limits.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_usage_limits.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_group_role_grant.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_user_group_role_grant.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_group_role_grant.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_user_group_role_grant.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_role_grants.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_user_role_grants.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/model_user_role_grants.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/model_user_role_grants.go diff --git a/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/service.go b/vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/service.go similarity index 100% rename from vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client/service.go rename to vendor/github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client/service.go diff --git a/vendor/modules.txt b/vendor/modules.txt index c8611d94..1bf2c7e8 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/v3 v3.0.0 +# github.com/cockroachdb/cockroach-cloud-sdk-go/v4 v4.0.0 ## explicit; go 1.17 -github.com/cockroachdb/cockroach-cloud-sdk-go/v3/pkg/client +github.com/cockroachdb/cockroach-cloud-sdk-go/v4/pkg/client # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew