Merge #11244

11244: Allow resource names that conflict with extra types r=iwahbe a=iwahbe Fixes #11207 Co-authored-by: Ian Wahbe <ian@wahbe.com>
pulumi · Nov 3, 2022 · b415bbd · b415bbd
2 parents 905756b + 3f71e8b
commit b415bbd
Show file tree

Hide file tree

Showing 8 changed files with 668 additions and 1 deletion.
diff --git a/...ending/20221103--sdkgen-go--allow-resource-names-that-conflict-with-additional-types.yaml b/...ending/20221103--sdkgen-go--allow-resource-names-that-conflict-with-additional-types.yaml
@@ -0,0 +1,4 @@
+changes:
+- type: fix
+  scope: sdkgen/go
+  description: Allow resource names that conflict with additional types.
diff --git a/pkg/codegen/go/gen.go b/pkg/codegen/go/gen.go
@@ -3223,6 +3223,10 @@ func generatePackageContextMap(tool string, pkg *schema.Package, goInfo GoPackag
 				names = append(names, cgstrings.Camel(rawResourceName(r))+suffix+"State")
 				names = append(names, "Get"+rawResourceName(r)+suffix)
 			}
+			if goInfo.GenerateResourceContainerTypes && !r.IsProvider {
+				names = append(names, rawResourceName(r)+suffix+"Array")
+				names = append(names, rawResourceName(r)+suffix+"Map")
+			}
 			return names
 		}
 

diff --git a/pkg/codegen/testing/test/testdata/go-nested-collections/go/codegen-manifest.json b/pkg/codegen/testing/test/testdata/go-nested-collections/go/codegen-manifest.json
@@ -3,6 +3,10 @@
     "repro/doc.go",
     "repro/foo.go",
     "repro/init.go",
+    "repro/overlap/consumer.go",
+    "repro/overlap/init.go",
+    "repro/overlap/someType.go",
+    "repro/overlap/someTypeMap.go",
     "repro/provider.go",
     "repro/pulumi-plugin.json",
     "repro/pulumiTypes.go",

diff --git a/pkg/codegen/testing/test/testdata/go-nested-collections/go/repro/overlap/consumer.go b/pkg/codegen/testing/test/testdata/go-nested-collections/go/repro/overlap/consumer.go
diff --git a/pkg/codegen/testing/test/testdata/go-nested-collections/go/repro/overlap/init.go b/pkg/codegen/testing/test/testdata/go-nested-collections/go/repro/overlap/init.go