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

Expose overlay flag #1361

Merged
merged 3 commits into from
May 15, 2024
Merged

Expose overlay flag #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74beff4
Expose overlay flag
EronWright May 15, 2024
7932e59
changelog
EronWright May 15, 2024
f887fbc
fix for recursive copy
EronWright May 15, 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
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### Improvements

- Plugin: will now automatically use the Gradle executor if build.gradle.kts is present
- Codegen: support for overlays

### Bug Fixes
5 changes: 5 additions & 0 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 @@ -76,6 +76,7 @@ See https://www.pulumi.com/docs/guides/pulumi-packages/schema/#language-specific
}

var versionArg, javaSdkVersionArg, schemaArg, outArg, overrideArg, buildArg string
var overlays []string

cmd.Flags().StringVar(&versionArg, "version", "",
"default semantic version for the generated package")
Expand All @@ -102,6 +103,9 @@ See https://www.pulumi.com/docs/guides/pulumi-packages/schema/#language-specific

`)

cmd.Flags().StringArrayVar(&overlays, "overlay", nil,
"path(s) to folders to mix into the generated code by copying")

cmd.Run = cmdutil.RunFunc(func(_ *cobra.Command, _ []string) error {
rootDir, err := os.Getwd()
if err != nil {
Expand All @@ -122,6 +126,7 @@ See https://www.pulumi.com/docs/guides/pulumi-packages/schema/#language-specific
Version: version,
RootDir: rootDir,
OutputDir: outArg,
Overlays: overlays,
}

if overrideArg != "" {
Expand Down
11 changes: 7 additions & 4 deletions pkg/cmd/pulumi-java-gen/overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,20 @@ func readOverlays(rootDir string, overlays []string) (map[string][]byte, error)
result := map[string][]byte{}
for _, overlay := range overlays {
overlayDir := filepath.Join(rootDir, overlay)
err := filepath.WalkDir(overlayDir, func(_ string, entry fs.DirEntry, err error) error {
err := filepath.WalkDir(overlayDir, func(path string, entry fs.DirEntry, err error) error {
if err != nil {
return err
}
if !entry.IsDir() {
sourcePath := filepath.Join(overlayDir, entry.Name())
bytes, err := os.ReadFile(sourcePath)
relativePath, err := filepath.Rel(overlayDir, path)
if err != nil {
return err
}
result[entry.Name()] = bytes
bytes, err := os.ReadFile(path)
if err != nil {
return err
}
result[relativePath] = bytes
}
return err
})
Expand Down
Loading