Follow up PR for https://github.com/fabric8io/docker-maven-plugin/pull/1373 #1383
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
rhuss
reviewed
Sep 29, 2020
| return args.get(argString.substring(1)); | ||
| } else if (argString.startsWith("${") && argString.endsWith("}") && args.containsKey(argString.substring(2, argString.length() - 1))) { | ||
| return args.get(argString.substring(2, argString.length() - 1)); | ||
| Pattern argPattern = Pattern.compile("\\$(?:\\{(.*)\\}|(.*))"); |
There was a problem hiding this comment.
Suggested change
| Pattern argPattern = Pattern.compile("\\$(?:\\{(.*)\\}|(.*))"); | |
| Pattern argPattern = Pattern.compile("^\\$(?:\\{(.*)\\}|(.*))$"); |
Align with start and end of the string. Otherwise you would also match bla$ad or ${foo}bar
There was a problem hiding this comment.
But please verify my assumption within the tests, too, please
| return args.get(argString.substring(2, argString.length() - 1)); | ||
| Pattern argPattern = Pattern.compile("\\$(?:\\{(.*)\\}|(.*))"); | ||
| Matcher matcher = argPattern.matcher(argString); | ||
| if (matcher.find()) { |
There was a problem hiding this comment.
Should you use matches() here as find also matches on substrings ? (if you ^ and $ this should make nor difference, but I still think "match" is cleare)
rohanKanojia
force-pushed
the
pr/followup1373
branch
from
bc9f71a
to
e0279d5
Compare
Use regex in order to resolve ARG value
rohanKanojia
force-pushed
the
pr/followup1373
branch
from
e0279d5
to
52aed4f
Compare
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.
Follow up PR for #1373
Use regex in order to resolve ARG value