You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/03/08 06:21:54 UTC
jclouds git commit: JCLOUDS-766: Add eu-central-1 to AWS S3 regions
Repository: jclouds
Updated Branches:
refs/heads/master dd670f3f7 -> c18371a79
JCLOUDS-766: Add eu-central-1 to AWS S3 regions
Also clean up some missing and duplicated properties.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/c18371a7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c18371a7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c18371a7
Branch: refs/heads/master
Commit: c18371a793f242bfee062b758836995a1cb94720
Parents: dd670f3
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Mar 7 21:19:56 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Mar 7 21:21:08 2016 -0800
----------------------------------------------------------------------
apis/sts/src/main/java/org/jclouds/aws/domain/Region.java | 5 ++---
.../src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 5 ++++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c18371a7/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
index 1a3a9c7..a0857f7 100644
--- a/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
+++ b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
@@ -110,7 +110,7 @@ public class Region {
*/
public static final String AP_NORTHEAST_1 = "ap-northeast-1";
- public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_WEST_1, US_WEST_2, EU_WEST_1, SA_EAST_1,
+ public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_WEST_1, US_WEST_2, EU_WEST_1, EU_CENTRAL_1, SA_EAST_1,
AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_NORTHEAST_1);
public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_WEST_1, US_WEST_2, SA_EAST_1,
@@ -121,9 +121,8 @@ public class Region {
Properties properties = regionProperties();
properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_S3));
// note that due to US_STANDARD the codes include US instead of US-VA
- properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-CA,US-OR,BR-SP,IE,SG,AU-NSW,JP-13");
+ properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-CA,US-OR,BR-SP,IE,DE-HE,SG,AU-NSW,JP-13");
properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US");
- properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ISO3166_CODES, "IE");
return properties;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c18371a7/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
index 899c3de..60417c6 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
@@ -20,6 +20,7 @@ import static org.jclouds.Constants.PROPERTY_ENDPOINT;
import static org.jclouds.aws.domain.Region.AP_NORTHEAST_1;
import static org.jclouds.aws.domain.Region.AP_SOUTHEAST_1;
import static org.jclouds.aws.domain.Region.AP_SOUTHEAST_2;
+import static org.jclouds.aws.domain.Region.EU_CENTRAL_1;
import static org.jclouds.aws.domain.Region.EU_WEST_1;
import static org.jclouds.aws.domain.Region.SA_EAST_1;
import static org.jclouds.aws.domain.Region.US_STANDARD;
@@ -69,6 +70,8 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ENDPOINT, "https://s3-us-west-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + US_WEST_2 + "." + ENDPOINT, "https://s3-us-west-2.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + SA_EAST_1 + "." + ENDPOINT, "https://s3-sa-east-1.amazonaws.com");
+ properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ENDPOINT,
+ "https://s3-eu-central-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ENDPOINT, "https://s3-eu-west-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ENDPOINT,
"https://s3-ap-southeast-1.amazonaws.com");
@@ -88,7 +91,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
.homepage(URI.create("http://aws.amazon.com/s3"))
.console(URI.create("https://console.aws.amazon.com/s3/home"))
.linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb")
- .iso3166Codes("US", "US-CA", "US-OR", "BR-SP", "IE", "SG", "AU-NSW", "JP-13")
+ .iso3166Codes("US", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "JP-13")
.defaultProperties(AWSS3ProviderMetadata.defaultProperties());
}