Skip to content

fix(hermetic-build): prevent overwrite of Version.java in new libraries' #12742

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

Merged
diegomarquezp merged 3 commits into from
Apr 10, 2026
Merged

fix(hermetic-build): prevent overwrite of Version.java in new libraries' #12742

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
798d0b3
fix(hermetic-build): use regex to prevent overwrite of Version.java
diegomarquezp Apr 10, 2026
00fd7b7
test: update golden
diegomarquezp Apr 10, 2026
615591d
chore: update template to latest
diegomarquezp Apr 10, 2026
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
2 changes: 1 addition & 1 deletion sdk-platform-java/hermetic_build/library_generation/templates/owlbot.yaml.monorepo.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ deep-remove-regex:

deep-preserve-regex:
- "/{{ module_name }}/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
- "/{{ module_name }}/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The generalization of the path to use .* instead of {{ module_name }} for Version.java introduces an inconsistency with the integration tests pattern on line 23, which still uses the specific {{ module_name }}. If the goal is to support libraries where the directory structure might not strictly match {{ module_name }}, or to provide a more generic template for the monorepo, line 23 should also be updated to use .*. Otherwise, integration tests for these libraries may be incorrectly overwritten during the build process.

Copy link
Copy Markdown
Contributor Author

@diegomarquezp diegomarquezp Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to new files being introduced to match the owl-bot-staging/v.* prefix.

Copy link
Copy Markdown
Contributor Author

@diegomarquezp diegomarquezp Apr 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the integration tests do not need this pattern because ITs are not generated, so only a pattern that prevents removal is necessary.
On the other hand Version.java is both preserved and generated, where the existing Version.java needs a different pattern than the one about to be transferred (i.e. owl-bot-staging/...), so we need a more relaxed pattern.


deep-copy-regex:
- source: "/{{ proto_path }}/(v.*)/.*-java/proto-google-.*/src"
Expand Down
2 changes: 1 addition & 1 deletion ...va/hermetic_build/library_generation/tests/resources/goldens/.OwlBot-hermetic-golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ deep-remove-regex:

deep-preserve-regex:
- "/java-bare-metal-solution/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
- "/java-bare-metal-solution/google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
- "/.*google-.*/src/main/java/com/google/cloud/.*/v.*/stub/Version.java"
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This golden file now contains an inconsistent preservation policy: Version.java is preserved using a generic regex, while integration tests (line 23) are still tied to the specific java-bare-metal-solution path. This should be updated to match the generalized pattern if the intention is for the configuration to be library-agnostic.

Copy link
Copy Markdown
Contributor Author

@diegomarquezp diegomarquezp Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is due to new files being introduced to match the owl-bot-staging/v.* prefix.

Copy link
Copy Markdown
Contributor Author

@diegomarquezp diegomarquezp Apr 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the integration tests do not need this pattern because ITs are not generated, so only a pattern that prevents removal is necessary.
On the other hand Version.java is both preserved and generated, where the existing Version.java needs a different pattern than the one about to be transferred (i.e. owl-bot-staging/...), so we need a more relaxed pattern.


deep-copy-regex:
- source: "/google/cloud/baremetalsolution/(v.*)/.*-java/proto-google-.*/src"
Expand Down
Loading