Refactor global Jib config management #2996
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Updated the description. Ready for review. |
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/BuildImageMojo.java
Outdated
Show resolved
Hide resolved
jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/UpdateChecker.java
Show resolved
Hide resolved
mpeddada1
reviewed
Jan 13, 2021
...ommon/src/main/java/com/google/cloud/tools/jib/plugins/common/globalconfig/GlobalConfig.java
Show resolved
Hide resolved
...n/src/test/java/com/google/cloud/tools/jib/plugins/common/globalconfig/GlobalConfigTest.java
Show resolved
Hide resolved
...n/src/test/java/com/google/cloud/tools/jib/plugins/common/globalconfig/GlobalConfigTest.java
Show resolved
Hide resolved
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MojoCommon.java
Show resolved
Hide resolved
This was referenced Jan 14, 2021
loosebazooka
approved these changes
Jan 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactored out the code from
UpdateCheckerthat handlesconfig.jsonbut with some changes:ATOMIC_MOVEis unnecessary, as @briandealwis pointed out in [gradle] Concurrency issue with many simultaneous builds #1273 (comment). For example,Files.move()is used to rename a file, and it cannot be that it will not do an atomic move when possible. Moreover, I think usingATOMIC_MOVEcan actually be problematic, according to theFiles.move()Javadoc. The behavior is implementation specific if a file already exists, where this code should deal with:config.jsonwas a warning and didn't cause a build to fail. Now we consider this as loading a global config, a build will fail if the code cannot load it.UpdateCheckerwas always creatingconfig.json.tmpandlastUpdateCheck.tmp. I think it's safer to create a fresh tmp file.