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

pulumiverse · Nov 1, 2024 · 4335b16 · 4335b16
1 parent 61bc3f1
commit 4335b16
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 **/obj/
 Pulumi.*.yaml
 **/node_modules/
+**/package-lock.json
 .DS_Store
 
 **/command-output/

diff --git a/provider/cmd/pulumi-resource-cockroach/schema.json b/provider/cmd/pulumi-resource-cockroach/schema.json
@@ -1099,9 +1099,6 @@
                     "type": "string",
                     "description": "Cloud provider used to host the cluster. Allowed values are: * GCP * AWS * AZURE\n"
                 },
-                "clusterId": {
-                    "type": "string"
-                },
                 "cockroachVersion": {
                     "type": "string",
                     "description": "Major version of CockroachDB running on the cluster.\n"
@@ -1157,7 +1154,6 @@
                 "cockroachVersion",
                 "creatorId",
                 "deleteProtection",
-                "clusterId",
                 "name",
                 "operationStatus",
                 "parentId",
@@ -1220,9 +1216,6 @@
                         "type": "string",
                         "description": "Cloud provider used to host the cluster. Allowed values are: * GCP * AWS * AZURE\n"
                     },
-                    "clusterId": {
-                        "type": "string"
-                    },
                     "cockroachVersion": {
                         "type": "string",
                         "description": "Major version of CockroachDB running on the cluster.\n"

diff --git a/provider/resources.go b/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{

diff --git a/sdk/dotnet/Cluster.cs b/sdk/dotnet/Cluster.cs
diff --git a/sdk/go/cockroach/cluster.go b/sdk/go/cockroach/cluster.go
diff --git a/sdk/nodejs/cluster.ts b/sdk/nodejs/cluster.ts
diff --git a/sdk/python/pulumiverse_cockroach/cluster.py b/sdk/python/pulumiverse_cockroach/cluster.py