You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by de...@apache.org on 2019/03/21 15:37:00 UTC
[jclouds] branch 2.1.x updated (0ce9261 -> cbc24de)
This is an automated email from the ASF dual-hosted git repository.
destevez pushed a change to branch 2.1.x
in repository https://gitbox.apache.org/repos/asf/jclouds.git.
from 0ce9261 [JCLOUDS-1428] Support for SAS token based Authentication for Azure Blob Storage (#1270)
new 8977130 Adds China North West Region (Ningxia)
new cbc24de Adds EU North 1 region (Stockholm)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/jclouds/aws/domain/Region.java | 35 +++++++++++++++++-----
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 +-
.../ec2/compute/AWSEC2TemplateBuilderLiveTest.java | 2 +-
.../org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 12 ++++++--
.../AWSS3ServiceIntegrationLiveTest.java | 4 ++-
5 files changed, 42 insertions(+), 13 deletions(-)
[jclouds] 01/02: Adds China North West Region (Ningxia)
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
destevez pushed a commit to branch 2.1.x
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 897713011df990f027c5de9bc2769c0aa2955e4e
Author: Dani Estevez <co...@danielestevez.com>
AuthorDate: Wed Mar 13 16:37:49 2019 -0400
Adds China North West Region (Ningxia)
---
.../main/java/org/jclouds/aws/domain/Region.java | 22 +++++++++++++++++-----
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 2 +-
2 files changed, 18 insertions(+), 6 deletions(-)
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 5c883c4..7a2fc30 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
@@ -34,6 +34,10 @@ import com.google.common.collect.ImmutableSet;
* @see <a
* href="http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?LocationSelection.html"
* />
+ * @see <a
+ * href="https://docs.aws.amazon.com/general/latest/gr/rande.html
+ * />
+ *
*/
public class Region {
/**
@@ -146,20 +150,26 @@ public class Region {
*/
public static final String CN_NORTH_1 = "cn-north-1";
+ /**
+ * Region in Ningxia, launched Dec 12, 2017. This region improves latency for China users
+ */
+ public static final String CN_NORTHWEST_1 = "cn-northwest-1";
+
public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_EAST_2, US_WEST_1, US_WEST_2,
CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, SA_EAST_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
- AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1);
+ AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2,
CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
- AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1);
+ AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
public static Properties regionPropertiesS3() {
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-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11");
+ properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,AU-NSW,"
+ + "IN-MH,JP-13,KR-11,CN-BJ,CN-NX");
properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US");
return properties;
}
@@ -167,7 +177,8 @@ public class Region {
public static Properties regionProperties() {
Properties properties = new Properties();
properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_REGIONS));
- properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,AU-NSW,IN-MH,JP-13,KR-11,CN-11");
+ properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,"
+ + "AU-NSW,IN-MH,JP-13,KR-11,CN-BJ,CN-NX");
properties.setProperty(PROPERTY_REGION + "." + US_EAST_1 + "." + ISO3166_CODES, "US-VA");
properties.setProperty(PROPERTY_REGION + "." + US_EAST_2 + "." + ISO3166_CODES, "US-OH");
properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ISO3166_CODES, "US-CA");
@@ -183,7 +194,8 @@ public class Region {
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTH_1 + "." + ISO3166_CODES, "IN-MH");
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_1 + "." + ISO3166_CODES, "JP-13");
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ISO3166_CODES, "KR-11");
- properties.setProperty(PROPERTY_REGION + "." + CN_NORTH_1 + "." + ISO3166_CODES, "CN-11");
+ properties.setProperty(PROPERTY_REGION + "." + CN_NORTH_1 + "." + ISO3166_CODES, "CN-BJ");
+ properties.setProperty(PROPERTY_REGION + "." + CN_NORTHWEST_1 + "." + ISO3166_CODES, "CN-NX");
return properties;
}
}
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
index 656a52c..a060b05 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
@@ -87,7 +87,7 @@ public class AWSEC2ProviderMetadata extends BaseProviderMetadata {
.defaultProperties(AWSEC2ProviderMetadata.defaultProperties())
.linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb")
.iso3166Codes("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE",
- "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11");
+ "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX");
}
@Override
[jclouds] 02/02: Adds EU North 1 region (Stockholm)
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
destevez pushed a commit to branch 2.1.x
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit cbc24de677ea04316046ab88df070f84c3a3622b
Author: Dani Estevez <co...@danielestevez.com>
AuthorDate: Wed Mar 13 17:01:59 2019 -0400
Adds EU North 1 region (Stockholm)
---
apis/sts/src/main/java/org/jclouds/aws/domain/Region.java | 15 ++++++++++++---
.../aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java | 2 +-
.../java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 12 +++++++++---
.../integration/AWSS3ServiceIntegrationLiveTest.java | 4 +++-
4 files changed, 25 insertions(+), 8 deletions(-)
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 7a2fc30..c68895d 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
@@ -66,6 +66,11 @@ public class Region {
public static final String EU_CENTRAL_1 = "eu-central-1";
/**
+ * EU (Stockholm)
+ */
+ public static final String EU_NORTH_1 = "eu-north-1";
+
+ /**
*
* US Standard
* <p/>
@@ -156,11 +161,13 @@ public class Region {
public static final String CN_NORTHWEST_1 = "cn-northwest-1";
public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_EAST_2, US_WEST_1, US_WEST_2,
- CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, SA_EAST_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
+ CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, SA_EAST_1, AP_SOUTHEAST_1,
+ AP_SOUTHEAST_2,
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2,
- CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2,
+ CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, AP_SOUTHEAST_1,
+ AP_SOUTHEAST_2,
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1);
public static Properties regionPropertiesS3() {
@@ -168,7 +175,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-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,AU-NSW,"
+ properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SE-AB,SG,"
+ + "AU-NSW,"
+ "IN-MH,JP-13,KR-11,CN-BJ,CN-NX");
properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US");
return properties;
@@ -189,6 +197,7 @@ public class Region {
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ISO3166_CODES, "GB-LND");
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ISO3166_CODES, "FR-IDF");
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ISO3166_CODES, "DE-HE");
+ properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ISO3166_CODES, "SE-AB");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ISO3166_CODES, "SG");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ISO3166_CODES, "AU-NSW");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTH_1 + "." + ISO3166_CODES, "IN-MH");
diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java
index 56433a4..5085cd9 100644
--- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java
+++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java
@@ -354,7 +354,7 @@ public class AWSEC2TemplateBuilderLiveTest extends EC2TemplateBuilderLiveTest {
@Override
protected Set<String> getIso3166Codes() {
return ImmutableSet.of("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE",
- "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11");
+ "SE-AB", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX");
}
}
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 c16c1c5..96cfc10 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
@@ -23,8 +23,10 @@ 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.AP_SOUTH_1;
import static org.jclouds.aws.domain.Region.CA_CENTRAL_1;
+import static org.jclouds.aws.domain.Region.CN_NORTHWEST_1;
import static org.jclouds.aws.domain.Region.CN_NORTH_1;
import static org.jclouds.aws.domain.Region.EU_CENTRAL_1;
+import static org.jclouds.aws.domain.Region.EU_NORTH_1;
import static org.jclouds.aws.domain.Region.EU_WEST_1;
import static org.jclouds.aws.domain.Region.EU_WEST_2;
import static org.jclouds.aws.domain.Region.EU_WEST_3;
@@ -84,6 +86,7 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ENDPOINT, "https://s3-eu-west-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ENDPOINT, "https://s3-eu-west-2.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ENDPOINT, "https://s3-eu-west-3.amazonaws.com");
+ properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ENDPOINT, "https://s3-eu-north-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ENDPOINT,
"https://s3-ap-southeast-1.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ENDPOINT,
@@ -95,7 +98,9 @@ public class AWSS3ProviderMetadata extends BaseProviderMetadata {
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ENDPOINT,
"https://s3-ap-northeast-2.amazonaws.com");
properties.setProperty(PROPERTY_REGION + "." + CN_NORTH_1 + "." + ENDPOINT,
- "https://s3.cn-north-1.amazonaws.com.cn");
+ "https://s3.cn-north-1.amazonaws.com.cn");
+ properties.setProperty(PROPERTY_REGION + "." + CN_NORTHWEST_1 + "." + ENDPOINT,
+ "https://s3.cn-north-s3.cn-northwest-1.amazonaws.com.cn");
return properties;
}
@@ -108,8 +113,9 @@ 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-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE", "SG",
- "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-11")
+ .iso3166Codes("US", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE", "SE"
+ + "-AB", "SG",
+ "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX")
.defaultProperties(AWSS3ProviderMetadata.defaultProperties());
}
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3ServiceIntegrationLiveTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3ServiceIntegrationLiveTest.java
index 0ad81f9..e8a22aa 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3ServiceIntegrationLiveTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3ServiceIntegrationLiveTest.java
@@ -36,8 +36,10 @@ public class AWSS3ServiceIntegrationLiveTest extends S3ServiceIntegrationLiveTes
"AU-NSW",
"BR-SP",
"CA",
- "CN-11",
+ "CN-BJ",
+ "CN-NX",
"DE-HE",
+ "SE-AB",
"GB-LND",
"FR-IDF",
"IE",