Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't import types referenced from local variables #11442

Merged
merged 1 commit into from
Nov 24, 2022
Merged

Don't import types referenced from local variables #11442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/codegen/go/gen_program.go
View file
Open in desktop
Expand Up @@ -449,12 +449,16 @@ func (g *generator) collectConvertImports(
//
// Fully solving this is deferred for later:
// TODO[pulumi/pulumi#8324].
if expr, ok := call.Args[0].(*model.TemplateExpression); ok {
if lit, ok := expr.Parts[0].(*model.LiteralValueExpression); ok &&
model.StringType.AssignableFrom(lit.Type()) &&
switch arg0 := call.Args[0].(type) {
case *model.TemplateExpression:
if lit, ok := arg0.Parts[0].(*model.LiteralValueExpression); ok &&
call.Type().AssignableFrom(lit.Type()) {
return
}
case *model.ScopeTraversalExpression:
if call.Type().AssignableFrom(arg0.Type()) {
return
}
}
g.collectTypeImports(program, schemaType, pulumiImports)
}
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/program_driver.go
View file
Open in desktop
Expand Up @@ -57,7 +57,6 @@ var PulumiPulumiProgramTests = []ProgramTest{
{
Directory: "assets-archives",
Description: "Assets and archives",
SkipCompile: codegen.NewStringSet("go"),
},
{
Directory: "synthetic-resource-properties",
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/assets-archives-pp/go/assets-archives.go
View file
Open in desktop
@@ -1,7 +1,6 @@
package main

import (
"github.com/pulumi/pulumi-aws/sdk/v5/go/aws"
"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/lambda"
"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/s3"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
Expand Down