Fix declarative config env substitution by disallowing '}' in default value #6793
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
jack-berg
commented
Oct 15, 2024
| @@ -634,6 +634,9 @@ private static java.util.stream.Stream<Arguments> envVarSubstitutionArgs() { | |||
| // Multiple environment variables referenced | |||
| Arguments.of("key1: ${STR_1}${STR_2}\n", mapOf(entry("key1", "value1value2"))), | |||
| Arguments.of("key1: ${STR_1} ${STR_2}\n", mapOf(entry("key1", "value1 value2"))), | |||
| Arguments.of( | |||
| "key1: ${STR_1} ${NOT_SET:-default} ${STR_2}\n", | |||
| mapOf(entry("key1", "value1 default value2"))), | |||
There was a problem hiding this comment.
Without this fix, this resolves to value1 default} ${STR_2.
The regex isn't able to differentiate between the } ending the second env var reference and the } ending the third reference.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6793 +/- ##
============================================
- Coverage 90.12% 90.10% -0.02%
+ Complexity 6546 6545 -1
============================================
Files 728 728
Lines 19702 19702
Branches 1935 1935
============================================
- Hits 17756 17753 -3
Misses 1347 1347
- Partials 599 602 +3 ☔ View full report in Codecov by Sentry. |
trask
approved these changes
Oct 15, 2024
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.
No description provided.