diff --git a/aws/core/src/main/java/org/jclouds/aws/domain/Region.java b/aws/core/src/main/java/org/jclouds/aws/domain/Region.java index d810458aaa..92524336b6 100644 --- a/aws/core/src/main/java/org/jclouds/aws/domain/Region.java +++ b/aws/core/src/main/java/org/jclouds/aws/domain/Region.java @@ -29,7 +29,7 @@ package org.jclouds.aws.domain; * */ public class Region { - + /** * EU (Ireland) *

diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java b/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java index a593985e54..5816012132 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java +++ b/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java @@ -23,6 +23,7 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_ACCESSKEYID; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_EXPIREINTERVAL; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AWS_SECRETACCESSKEY; import static org.jclouds.aws.sqs.reference.SQSConstants.PROPERTY_SQS_ENDPOINT; +import static org.jclouds.aws.sqs.reference.SQSConstants.PROPERTY_SQS_ENDPOINT_AP_SOUTHEAST_1; import static org.jclouds.aws.sqs.reference.SQSConstants.PROPERTY_SQS_ENDPOINT_EU_WEST_1; import static org.jclouds.aws.sqs.reference.SQSConstants.PROPERTY_SQS_ENDPOINT_US_EAST_1; import static org.jclouds.aws.sqs.reference.SQSConstants.PROPERTY_SQS_ENDPOINT_US_WEST_1; @@ -41,12 +42,15 @@ public class SQSPropertiesBuilder extends PropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); - properties.setProperty(PROPERTY_SQS_ENDPOINT, "https://queue.amazonaws.com"); - properties.setProperty(PROPERTY_SQS_ENDPOINT_US_EAST_1, "https://queue.amazonaws.com"); - properties.setProperty(PROPERTY_SQS_ENDPOINT_US_WEST_1, - "https://us-west-1.queue.amazonaws.com"); - properties.setProperty(PROPERTY_SQS_ENDPOINT_EU_WEST_1, - "https://eu-west-1.queue.amazonaws.com"); + properties.setProperty(PROPERTY_SQS_ENDPOINT, "https://sqs.us-east-1.amazonaws.com"); + properties + .setProperty(PROPERTY_SQS_ENDPOINT_US_EAST_1, "https://sqs.us-east-1.amazonaws.com"); + properties + .setProperty(PROPERTY_SQS_ENDPOINT_US_WEST_1, "https://sqs.us-west-1.amazonaws.com"); + properties + .setProperty(PROPERTY_SQS_ENDPOINT_EU_WEST_1, "https://sqs.eu-west-1.amazonaws.com"); + properties.setProperty(PROPERTY_SQS_ENDPOINT_AP_SOUTHEAST_1, + "https://sqs.ap-southeast-1.amazonaws.com"); properties.setProperty(PROPERTY_AWS_EXPIREINTERVAL, "60"); return properties; } diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java b/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java index 47157615e1..42f55ea9f5 100755 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java +++ b/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java @@ -94,9 +94,11 @@ public class SQSRestClientModule extends AbstractModule { Map provideRegions( @Named(SQSConstants.PROPERTY_SQS_ENDPOINT_US_EAST_1) String useast, @Named(SQSConstants.PROPERTY_SQS_ENDPOINT_US_WEST_1) String uswest, - @Named(SQSConstants.PROPERTY_SQS_ENDPOINT_EU_WEST_1) String euwest) { + @Named(SQSConstants.PROPERTY_SQS_ENDPOINT_EU_WEST_1) String euwest, + @Named(SQSConstants.PROPERTY_SQS_ENDPOINT_AP_SOUTHEAST_1) String apsoutheast) { return ImmutableMap. of(Region.US_EAST_1, URI.create(useast), Region.US_WEST_1, - URI.create(uswest), Region.EU_WEST_1, URI.create(euwest)); + URI.create(uswest), Region.EU_WEST_1, URI.create(euwest), Region.AP_SOUTHEAST_1, URI + .create(apsoutheast)); } @Provides diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSConstants.java b/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSConstants.java index ce8c914b98..c6870130ca 100755 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSConstants.java +++ b/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSConstants.java @@ -31,4 +31,6 @@ public interface SQSConstants extends AWSConstants { public static final String PROPERTY_SQS_ENDPOINT_EU_WEST_1 = "jclouds.sqs.endpoint.eu_west_1"; public static final String PROPERTY_SQS_ENDPOINT_US_EAST_1 = "jclouds.sqs.endpoint.us_east_1"; public static final String PROPERTY_SQS_ENDPOINT_US_WEST_1 = "jclouds.sqs.endpoint.us_west_1"; + public static final String PROPERTY_SQS_ENDPOINT_AP_SOUTHEAST_1 = "jclouds.sqs.endpoint.ap_southeast_1"; + } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java index d45b9a38e8..e13bef4ce6 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java @@ -43,10 +43,10 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.inject.internal.ImmutableMap; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code AMIClient} @@ -85,9 +85,9 @@ public class AMIClientLiveTest { client.describeImagesInRegion(null, imageIds("asdaasdsa")); } - @Test(enabled = false) public void testDescribeImages() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client.describeImagesInRegion(region)); assertNotNull(allResults); assert allResults.size() >= 2 : allResults.size(); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java index 02c726f849..294ce7af47 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java @@ -41,9 +41,9 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code AvailabilityZoneAndRegionClient} @@ -67,8 +67,8 @@ public class AvailabilityZoneAndRegionClientLiveTest { } public void testDescribeAvailabilityZones() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client .describeAvailabilityZonesInRegion(region)); assertNotNull(allResults); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java index 87b1071788..94cba674b2 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java @@ -44,9 +44,9 @@ import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code ElasticBlockStoreClient} @@ -72,8 +72,8 @@ public class ElasticBlockStoreClientLiveTest { @Test void testDescribeVolumes() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client.describeVolumesInRegion(region)); assertNotNull(allResults); if (allResults.size() >= 1) { @@ -96,8 +96,8 @@ public class ElasticBlockStoreClientLiveTest { this.volumeId = expected.getId(); - SortedSet result = Sets.newTreeSet(client.describeVolumesInRegion(null, - expected.getId())); + SortedSet result = Sets.newTreeSet(client.describeVolumesInRegion(null, expected + .getId())); assertNotNull(result); assertEquals(result.size(), 1); Volume volume = result.iterator().next(); @@ -171,8 +171,8 @@ public class ElasticBlockStoreClientLiveTest { @Test void testDescribeSnapshots() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client.describeSnapshotsInRegion(region)); assertNotNull(allResults); if (allResults.size() >= 1) { @@ -213,8 +213,7 @@ public class ElasticBlockStoreClientLiveTest { @Test(dependsOnMethods = "testCreateSnapshotInRegion") void testDeleteVolumeInRegion() { client.deleteVolumeInRegion(null, volumeId); - SortedSet result = Sets.newTreeSet(client.describeVolumesInRegion(null, - volumeId)); + SortedSet result = Sets.newTreeSet(client.describeVolumesInRegion(null, volumeId)); assertEquals(result.size(), 1); Volume volume = result.iterator().next(); assertEquals(volume.getStatus(), Volume.Status.DELETING); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java index 4cee355872..4dd7dde492 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticIPAddressClientLiveTest.java @@ -35,8 +35,8 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code ElasticIPAddressClient} @@ -61,8 +61,8 @@ public class ElasticIPAddressClientLiveTest { @Test void testDescribeAddresses() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client .describeAddressesInRegion(region)); assertNotNull(allResults); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticLoadBalancerClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticLoadBalancerClientLiveTest.java index 1d30b1687c..d8221566cb 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticLoadBalancerClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticLoadBalancerClientLiveTest.java @@ -37,7 +37,7 @@ import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code ElasticIPAddressClient} @@ -77,8 +77,8 @@ public class ElasticLoadBalancerClientLiveTest { @Test(dependsOnMethods = "testCreateLoadBalancer") void testDescribeLoadBalancers() { String name = "TestDescribeLoadBalancer"; - for (String region : ImmutableSet.of(Region.US_EAST_1, Region.US_WEST_1, Region.EU_WEST_1, - Region.AP_SOUTHEAST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { Set allResults = client.describeLoadBalancers(region, name); assertNotNull(allResults); assert (allResults.size() >= 1); @@ -87,8 +87,8 @@ public class ElasticLoadBalancerClientLiveTest { @Test void testDeleteLoadBalancer() { - for (String region : ImmutableSet.of(Region.US_EAST_1, Region.US_WEST_1, Region.EU_WEST_1, - Region.AP_SOUTHEAST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { client.deleteLoadBalancer(region, "TestLoadBalancer"); } } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java index 29d286fe46..957461c312 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java @@ -34,7 +34,7 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code EC2Client} @@ -61,8 +61,8 @@ public class InstanceClientLiveTest { @Test void testDescribeInstances() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { Set allResults = client.describeInstancesInRegion(region); assertNotNull(allResults); assert allResults.size() >= 0 : allResults.size(); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java index 3e5836a809..89cb3fa2c5 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/KeyPairClientLiveTest.java @@ -35,8 +35,8 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code KeyPairClient} @@ -61,8 +61,8 @@ public class KeyPairClientLiveTest { @Test void testDescribeKeyPairs() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client.describeKeyPairsInRegion(region)); assertNotNull(allResults); @@ -95,8 +95,8 @@ public class KeyPairClientLiveTest { assertNotNull(result.getKeyFingerprint()); assertEquals(result.getKeyName(), keyName); - SortedSet twoResults = Sets.newTreeSet(client.describeKeyPairsInRegion( - null, keyName)); + SortedSet twoResults = Sets.newTreeSet(client + .describeKeyPairsInRegion(null, keyName)); assertNotNull(twoResults); assertEquals(twoResults.size(), 1); KeyPair listPair = twoResults.iterator().next(); diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java index f83bcf93c6..e0a3cf847f 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/SecurityGroupClientLiveTest.java @@ -42,9 +42,9 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code SecurityGroupClient} @@ -69,7 +69,8 @@ public class SecurityGroupClientLiveTest { @Test void testDescribe() { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client .describeSecurityGroupsInRegion(region)); assertNotNull(allResults); diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java index 5bc0333a9f..7c3c556791 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java @@ -37,8 +37,8 @@ import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.inject.internal.Lists; /** * Tests behavior of {@code SQSClient} @@ -66,7 +66,8 @@ public class SQSClientLiveTest { @Test void testListQueuesInRegion() throws InterruptedException { - for (String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1)) { + for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { SortedSet allResults = Sets.newTreeSet(client.listQueuesInRegion(region)); assertNotNull(allResults); if (allResults.size() >= 1) { @@ -82,8 +83,8 @@ public class SQSClientLiveTest { void testCreateQueue() throws InterruptedException { String queueName = PREFIX + "1"; - for (final String region : ImmutableSet.of(Region.EU_WEST_1, Region.US_EAST_1, - Region.US_WEST_1)) { + for (final String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, + Region.US_WEST_1, Region.AP_SOUTHEAST_1)) { try { SortedSet result = Sets.newTreeSet(client.listQueuesInRegion(region, queuePrefix(queueName))); @@ -109,7 +110,8 @@ public class SQSClientLiveTest { throw e; } } - assertEquals(queue.getRegion(), region); + if (region != null) + assertEquals(queue.getRegion(), region); assertEquals(queue.getName(), queueName); assertQueueInList(region, queue); queues.add(queue); diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java b/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java index 6356fd8d16..ef1ea3deaf 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java @@ -75,12 +75,14 @@ public class SQSRestClientModuleTest { @Test void testRegions() { - Map regionMap = createInjector().getInstance(new Key>(SQS.class) { - }); + Map regionMap = createInjector().getInstance( + new Key>(SQS.class) { + }); assertEquals(regionMap, ImmutableMap. of(Region.US_EAST_1, URI - .create("https://queue.amazonaws.com"), Region.US_WEST_1, URI - .create("https://us-west-1.queue.amazonaws.com"), Region.EU_WEST_1, URI - .create("https://eu-west-1.queue.amazonaws.com"))); + .create("https://sqs.us-east-1.amazonaws.com"), Region.US_WEST_1, URI + .create("https://sqs.us-west-1.amazonaws.com"), Region.EU_WEST_1, URI + .create("https://sqs.eu-west-1.amazonaws.com"), Region.AP_SOUTHEAST_1, URI + .create("https://sqs.ap-southeast-1.amazonaws.com"))); } @Test