Merge property file reading logic #769
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
Contributor
Or-Geva
commented
Dec 4, 2023
Or-Geva
commented
- All tests passed. If this feature is not already covered by the tests, I added new tests.
Or-Geva
added
ignore for release
github-actions
bot
removed
the
safe to test
Or-Geva
added
the
safe to test
github-actions
bot
removed
the
safe to test
yahavi
requested changes
Dec 6, 2023
build-info-extractor/src/test/java/org/jfrog/build/extractor/BuildExtractorUtilsTest.java
Outdated
Show resolved
Hide resolved
| @@ -115,33 +111,34 @@ public void getBuildInfoPropertiesFromEncryptedFile() throws IOException, Invali | |||
| } | |||
|
|
|||
| public void failToReadEncryptedFileWithNoKey() throws IOException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { | |||
| setupEncryptedFileTest(); | |||
| // Create encrypted file with properties | |||
| createProperty(); | |||
There was a problem hiding this comment.
This line does nothing. Shouldn't be this?
try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile.toFile())) {
createProperty().store(fileOutputStream, "");
}There was a problem hiding this comment.
You're right, it should be setupEncryptedFileTest(createProperty()); and we are removing the keys on line 117
build-info-extractor/src/test/java/org/jfrog/build/extractor/BuildExtractorUtilsTest.java
Outdated
Show resolved
Hide resolved
| return props; | ||
| } | ||
|
|
||
| private Properties createPropertyEnv() { |
There was a problem hiding this comment.
This function does not create environment variables.
It also does the same as createProperty.
There was a problem hiding this comment.
It generates slightly different properties apart from using createProperty to specifically handle properties associated with environment reads, distinguishing them from file-related properties.
Or-Geva
added
the
safe to test
github-actions
bot
removed
the
safe to test
3 tasks
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.