[program-gen] Fix emitted import statements in generated programs such that imports with the same symbol are fully qualified #1573
Conversation
… same symbol are fully qualified
pkg/codegen/java/gen_program.go
Outdated
| for _, importDefA := range importStatements { | ||
| for _, importDefB := range importStatements { | ||
| if importMember(importDefA) == importMember(importDefB) && importDefA != importDefB { | ||
| importsWithDuplicateName.Add(importDefA) | ||
| importsWithDuplicateName.Add(importDefB) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I'm kind of not a fan of this n^2 approach when we can use a set of importMembers.
what if it is a super large program with many files each with tons of imports? It's premature optimization but seems reasonable to turn into a set check
There was a problem hiding this comment.
I've optimized the lookup ✅ can you have another look?
pkg/codegen/java/gen_program.go
Outdated
| } | ||
|
|
||
| g.importStatements = importStatements |
There was a problem hiding this comment.
this makes me think the name is misleading. They are not import statements they are dependencies because genImport is only called for non conflicting symbols
There was a problem hiding this comment.
Renamed to emittedImportTypeSymbols ✅
pkg/codegen/java/gen_program.go
Outdated
| for _, importStatement := range g.importStatements { | ||
| // if there is an import statement that ends with the same member name | ||
| // return the fully qualified resource name | ||
| if strings.HasSuffix(importStatement, "."+member) && pulumiImport(pkg, module, member) != importStatement { | ||
| return pulumiImport(pkg, module, member) | ||
| } | ||
| } |
There was a problem hiding this comment.
instead of saving all import statements wouldn't it also be better to just save a set of all types that need to be fully qualified and just check this isn't in that set?
Description
Fix emitted import statements in generated programs such that imports with the same symbol are fully qualified
if we have two imports such as the following:
com.pulumi.my_package.ResourceTypecom.pulumi.your_package.ResourceTypethen we shouldn't generate import statements for them instead, we use the fully qualified name at the usage site.
Unskips
l2-failed-create-continue-on-errorFixes #1558