Upgrade terraform-provider-cockroach to v1.8.0 (#50)

* make tfgen

* make build_sdks

* Do not remap the `id` field to `clusterID` for the `Cluster` itself

.gitignore

@@ -6,6 +6,7 @@
 **/obj/
 Pulumi.*.yaml
 **/node_modules/
+**/package-lock.json
 .DS_Store
 
 **/command-output/

provider/go.mod

@@ -45,8 +45,8 @@ require (
 	github.com/charmbracelet/lipgloss v0.7.1 // indirect
 	github.com/cheggaaa/pb v1.0.29 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cockroachdb/cockroach-cloud-sdk-go v1.11.0 // indirect
-	github.com/cockroachdb/terraform-provider-cockroach v1.7.0 // indirect
+	github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0 // indirect
+	github.com/cockroachdb/terraform-provider-cockroach v1.8.0 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

provider/go.sum

@@ -319,10 +319,10 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cockroachdb/cockroach-cloud-sdk-go v1.11.0 h1:xqQ2/m+tCIbvoL9u61TAQ5qnu+KDrIH74A7Ym2gdzG4=
-github.com/cockroachdb/cockroach-cloud-sdk-go v1.11.0/go.mod h1:oG9ylbcVGOF7IbVAW2nx5F6ry9a2dZD1H9rd+qd4P60=
-github.com/cockroachdb/terraform-provider-cockroach v1.7.0 h1:Vllu5/7Ku99EdwW0WZwp6UjaNqyf+De5kQU8iAj2T2g=
-github.com/cockroachdb/terraform-provider-cockroach v1.7.0/go.mod h1:BmMUYvr61ABIuseEuaxXzG+GEArTHNDA6IoSdAPH4n4=
+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/terraform-provider-cockroach v1.8.0 h1:ACf+FYoelFf4rFmQgm+Tn5cfPPkWDIjOlmqQcfNiqho=
+github.com/cockroachdb/terraform-provider-cockroach v1.8.0/go.mod h1:+OygEPSLegOQgLNKW2C4HKimAlP7VQzIpRepX9UY6Q4=
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=
 github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=

provider/resources.go

@@ -88,16 +88,7 @@ func Provider() tfbridge.ProviderInfo {
 				},
 				ComputeID: computeIDField("id"),
 			},
-			"cockroach_cluster": {
-				Tok: cockroachResource(cockroachMod, "Cluster"),
-				Fields: map[string]*tfbridge.SchemaInfo{
-					"id": {
-						Name: "clusterId",
-						Type: "string",
-					},
-				},
-				ComputeID: computeIDField("id"),
-			},
+			"cockroach_cluster": {Tok: cockroachResource(cockroachMod, "Cluster")},
 			"cockroach_cmek": {
 				Tok: cockroachResource(cockroachMod, "Cmek"),
 				Fields: map[string]*tfbridge.SchemaInfo{

provider/shim/go.mod

@@ -3,13 +3,13 @@ module github.com/cockroachdb/terraform-provider-cockroach/shim
 go 1.22
 
 require (
-	github.com/cockroachdb/terraform-provider-cockroach v1.7.0
+	github.com/cockroachdb/terraform-provider-cockroach v1.8.0
 	github.com/hashicorp/terraform-plugin-framework v1.6.1
 )
 
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/cockroachdb/cockroach-cloud-sdk-go v1.11.0 // indirect
+	github.com/cockroachdb/cockroach-cloud-sdk-go/v3 v3.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/google/uuid v1.4.0 // indirect

provider/shim/go.sum

@@ -6,10 +6,10 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 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 v1.11.0 h1:xqQ2/m+tCIbvoL9u61TAQ5qnu+KDrIH74A7Ym2gdzG4=
-github.com/cockroachdb/cockroach-cloud-sdk-go v1.11.0/go.mod h1:oG9ylbcVGOF7IbVAW2nx5F6ry9a2dZD1H9rd+qd4P60=
-github.com/cockroachdb/terraform-provider-cockroach v1.7.0 h1:Vllu5/7Ku99EdwW0WZwp6UjaNqyf+De5kQU8iAj2T2g=
-github.com/cockroachdb/terraform-provider-cockroach v1.7.0/go.mod h1:BmMUYvr61ABIuseEuaxXzG+GEArTHNDA6IoSdAPH4n4=
+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/terraform-provider-cockroach v1.8.0 h1:ACf+FYoelFf4rFmQgm+Tn5cfPPkWDIjOlmqQcfNiqho=
+github.com/cockroachdb/terraform-provider-cockroach v1.8.0/go.mod h1:+OygEPSLegOQgLNKW2C4HKimAlP7VQzIpRepX9UY6Q4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=