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

Apply default dependencies when called from Pulumi CLI #1501

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Apply default dependencies when called from Pulumi CLI #1501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f300a6b
Apply default dependencies when called from Pulumi CLI
danielrbradley Dec 11, 2024
aee8bb3
Fix applying defaults
danielrbradley Dec 11, 2024
271061d
Always specify default SDK version
danielrbradley Dec 11, 2024
6c1c330
Fix lint warning
danielrbradley Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/cmd/pulumi-java-gen/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ See https://www.pulumi.com/docs/guides/pulumi-packages/schema/#language-specific
return err
}

opts.PackageInfo = opts.PackageInfo.With(buildArgOverrides).
WithDefaultDependencies()
opts.PackageInfo = opts.PackageInfo.With(buildArgOverrides)

if javaSdkVersionArg != "" {
parsedVersion, err := semver.ParseTolerant(javaSdkVersionArg)
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/java/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,6 +2042,7 @@ func generateModuleContextMap(tool string, pkg *schema.Package) (map[string]*mod
info = &javaInfo
infos[def] = info
}
info.WithDefaultDependencies()
return info
}
infos[pkg] = getPackageInfo(pkg.Reference())
Expand Down
Loading