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

Mark external modules as forign #11437

Merged
merged 1 commit into from Nov 23, 2022
+14 −11
Merged

Mark external modules as forign #11437

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
11 changes: 7 additions & 4 deletions pkg/codegen/go/gen.go
View file
Open in desktop
Expand Up @@ -40,6 +40,11 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)

// A signifier that the module is external, and will never match.
//
// This token is always an invalid module since ':' is not allowed within modules.
const ExternalModuleSig = ":always-external:"

type typeDetails struct {
// Note: if any of {ptr,array,map}Input are set, input and the corresponding output field must also be set. The
// mark* functions ensure that these invariants hold.
Expand Down Expand Up @@ -242,10 +247,7 @@ func (pkg *pkgContext) resolveEnumType(t *schema.EnumType) string {
}

extPkgCtx, _ := pkg.contextForExternalReference(t)
enumType := extPkgCtx.tokenToEnum(t.Token)
if !strings.Contains(enumType, ".") {
enumType = fmt.Sprintf("%s.%s", extPkgCtx.pkg.Name, enumType)
}
enumType := extPkgCtx.typeString(t)
return enumType
}

Expand Down Expand Up @@ -730,6 +732,7 @@ func (pkg *pkgContext) contextForExternalReference(t schema.Type) (*pkgContext,
extPkgCtx.pkgImportAliases = pkgImportAliases
extPkgCtx.externalPackages = pkg.externalPackages
mod := tokenToPackage(extPkg, goInfo.ModuleToPackage, token)
extPkgCtx.mod = ExternalModuleSig

return extPkgCtx, *maps[mod].detailsForType(t)
}
Expand Down
6 changes: 4 additions & 2 deletions pkg/codegen/go/gen_program_expressions.go
View file
Open in desktop
Expand Up @@ -168,8 +168,10 @@ func (g *generator) genSafeEnum(w io.Writer, to *model.EnumType) func(member *sc
}
memberTag, err := makeSafeEnumName(memberTag, enumName)
contract.AssertNoErrorf(err, "Enum is invalid")
namespace := tokenToModule(to.Token)
g.Fgenf(w, "%s.%s", namespace, memberTag)
pkg, mod, _, _ := pcl.DecomposeToken(to.Token, to.SyntaxNode().Range())
mod = g.getModOrAlias(pkg, mod, mod)

g.Fgenf(w, "%s.%s", mod, memberTag)
}
}

Expand Down
2 changes: 0 additions & 2 deletions pkg/codegen/testing/test/program_driver.go
View file
Open in desktop
Expand Up @@ -113,8 +113,6 @@ var PulumiPulumiProgramTests = []ProgramTest{
{
Directory: "aws-webserver",
Description: "AWS Webserver",
SkipCompile: codegen.NewStringSet("go"),
// Blocked on go: TODO[pulumi/pulumi#8070]
},
{
Directory: "simple-range",
Expand Down
6 changes: 3 additions & 3 deletions pkg/codegen/testing/test/testdata/aws-webserver-pp/go/aws-webserver.go
View file
Open in desktop
Expand Up @@ -25,9 +25,9 @@ func main() {
if err != nil {
return err
}
ami, err := aws.GetAmi(ctx, &GetAmiArgs{
Filters: []GetAmiFilter{
GetAmiFilter{
ami, err := aws.GetAmi(ctx, &aws.GetAmiArgs{
Filters: []aws.GetAmiFilter{
aws.GetAmiFilter{
Name: "name",
Values: []string{
"amzn-ami-hvm-*-x86_64-ebs",
Expand Down