Fix dynamic bridge clobbering non-string ID props (#2828)

pulumi · Jan 13, 2025 · 2a95c03 · 2a95c03
1 parent 27c2419
commit 2a95c03
Show file tree

Hide file tree

Showing 3 changed files with 3,901 additions and 1 deletion.
diff --git a/dynamic/internal/fixup/properties.go b/dynamic/internal/fixup/properties.go
@@ -185,7 +185,9 @@ func fixID(providerName string, tokenPrefix string) fixupProperty {
 			// If either id.Optional or id.Required are set, then the provider allows
 			// (or requires) the user to set "id" as an input. Pulumi does not allow
 			// that, so we alias "id".
-			if !tfIDProperty.Optional() && !tfIDProperty.Required() {
+			// Alternatively if the type of id is not string, we'll replace the property
+			// so we need to alias the original property.
+			if !tfIDProperty.Optional() && !tfIDProperty.Required() && tfIDProperty.Type() == shim.TypeString {
 				return nil
 			}
 

diff --git a/dynamic/provider_test.go b/dynamic/provider_test.go
@@ -454,6 +454,7 @@ func TestSchemaGeneration(t *testing.T) { //nolint:paralleltest
 	// testSchema("Azure/alz", "0.11.1")
 	testSchema("Backblaze/b2", "0.8.9")
 	testSchema("databricks/databricks", "1.50.0")
+	testSchema("BunnyWay/bunnynet", "0.5.1")
 }
 
 func TestSchemaGenerationFullDocs(t *testing.T) { //nolint:paralleltest