SecurityGroupEditor- Allow for different jclouds prefixes on different clouds #549
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
neykov
suggested changes
Feb 3, 2017
| final Iterable<SecurityGroup> groupsMatching = findSecurityGroupsMatching(new Predicate<SecurityGroup>() { | ||
| final String rawName = name.matches(IS_JCLOUDS_PREFIXED_REGEX) | ||
| ? name.substring(JCLOUDS_PREFIX_REGEX.length()) | ||
| : name; |
There was a problem hiding this comment.
Now that you are using a regex could simplify to name.replaceAll("^jclouds[#-]", "")
| @Override | ||
| public boolean apply(final SecurityGroup input) { | ||
| return input.getName().equals(query); | ||
| return input.getName().matches(JCLOUDS_PREFIX_REGEX + rawName); |
There was a problem hiding this comment.
Need to escape the name with "Pattern.quote(rawName)". Or better yet use the same method as above to strip the prefix and compare the non-prefixed names.
jclouds on AWS uses 'jclouds#' while on Openstack it is 'jclouds-'. Also fix some incorrect log messages and add a bit of detail to them.
geomacy
force-pushed
the
jclouds-prefix-fix
branch
from
bb7fb55
to
98f521b
Compare
|
changes made as suggested thanks @neykov, and squashed |
drigodwin
approved these changes
Feb 7, 2017
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.
jclouds on AWS uses 'jclouds#' while on Openstack it is 'jclouds-'.
Also fix some incorrect log messages and add a bit of detail to them.