use cockroach-cloud-sdk-go v4

cockroachdb · Oct 3, 2024 · 85fb7c5 · 85fb7c5
1 parent 6226806
commit 85fb7c5
Show file tree

Hide file tree

Showing 259 changed files with 134 additions and 136 deletions.
diff --git a/Makefile b/Makefile
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/api_oidc_config.go b/internal/provider/api_oidc_config.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/cockroachdb/cockroach-cloud-sdk-go/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/api_oidc_config_test.go b/internal/provider/api_oidc_config_test.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cockroachdb/cockroach-cloud-sdk-go/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -26,7 +26,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/cockroachdb/terraform-provider-cockroach/internal/validators"
 	"github.com/hashicorp/terraform-plugin-framework-validators/resourcevalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"

diff --git 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"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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"