You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by Andrew Bayer <no...@github.com> on 2013/08/15 23:07:59 UTC
[jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based on
JCLOUDS-242 fix (#117)
Turns out JCLOUDS-242 applied to AWSEC2SecurityGroupExtension too. This fixes it.
You can merge this Pull Request by running:
git pull https://github.com/abayer/jclouds-1 jclouds-242-ext-fix
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/117
-- Commit Summary --
* JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based on JCLOUDS-242 fix.
-- File Changes --
M providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtension.java (41)
M providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/extensions/AWSEC2SecurityGroupExtensionExpectTest.java (11)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/117.patch
https://github.com/jclouds/jclouds/pull/117.diff
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> @@ -135,8 +117,9 @@ public SecurityGroup addIpPermission(IpProtocol protocol, int startPort, int end
> public SecurityGroup removeIpPermission(IpPermission ipPermission, SecurityGroup group) {
> String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());
> String name = group.getName();
> + String id = Iterables.get(client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, name), 0).getId();
`getOnlyElement` again?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806156
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> @@ -126,7 +107,8 @@ public SecurityGroup addIpPermission(IpProtocol protocol, int startPort, int end
> }
> }
>
> - client.getSecurityGroupApi().get().authorizeSecurityGroupIngressInRegion(region, name, builder.build());
> +
[trivial] Remove blank line added?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806150
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #146](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/146/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22836457
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #603](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/603/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22734547
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());
> String name = group.getName();
> + String id = Iterables.get(client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, name), 0).getId();
> +
[trivial] Remove added blank line?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806105
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Bayer <no...@github.com>.
Note that this is just for master - the extension isn't around in 1.6.x.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22731658
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #320](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/320/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22836392
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
+1. The [test failure](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/org.apache.jclouds$jclouds-core/604/testReport/junit/org.jclouds.rest.functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest/testCacheIsFasterWhenNoAnnotationPresent/) for the Java 7 PR builder was unrelated.
Thanks!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22996613
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #145](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/145/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22734401
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Bayer <no...@github.com>.
New version incoming, with whitespace cleaned up and a new EC2SecurityGroupNameToId function.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22835325
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> @@ -105,6 +84,8 @@ public SecurityGroup addIpPermission(IpProtocol protocol, int startPort, int end
> Iterable<String> groupIds, SecurityGroup group) {
> String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());
> String name = group.getName();
> + String id = Iterables.get(client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, name), 0).getId();
> +
Same comment as above?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806143
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> @@ -148,7 +131,7 @@ public SecurityGroup removeIpPermission(IpProtocol protocol, int startPort, int
> Iterable<String> groupIds, SecurityGroup group) {
> String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());
> String name = group.getName();
> -
> + String id = Iterables.get(client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, name), 0).getId();
Create a function for this line? It seems to be repeated a whole bunch of times..?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806169
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #604](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/604/) UNSTABLE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22836517
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds #318](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/318/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117#issuecomment-22733639
Re: [jclouds] JCLOUDS-242. Fixing AWSEC2SecurityGroupExtension based
on JCLOUDS-242 fix (#117)
Posted by Andrew Phillips <no...@github.com>.
> String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());
> String name = group.getName();
> + String id = Iterables.get(client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, name), 0).getId();
[Iterables.getOnlyElement](http://guava-libraries.googlecode.com/svn/tags/release02/javadoc/com/google/common/collect/Iterables.html#getOnlyElement\(java.lang.Iterable\))?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/117/files#r5806137