Skip to content
This repository was archived by the owner on Aug 6, 2025. It is now read-only.

Commit 554418e

Browse files
gaulgaul
authored
Add EU_CENTRAL_2, EU_SOUTH_1, and EU_SOUTH_2 (#219)
1 parent 1f181bf commit 554418e

File tree

4 files changed

+59
-21
lines changed

4 files changed

+59
-21
lines changed

‎apis/sts/src/main/java/org/jclouds/aws/domain/Region.java‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,26 @@ public class Region {
6060
*/
6161
public static final String EU_WEST_3 = "eu-west-3";
6262

63+
/**
64+
* EU (Milan)
65+
*/
66+
public static final String EU_SOUTH_1 = "eu-south-1";
67+
68+
/**
69+
* EU (Spain)
70+
*/
71+
public static final String EU_SOUTH_2 = "eu-south-2";
72+
6373
/**
6474
* EU (Frankfurt)
6575
*/
6676
public static final String EU_CENTRAL_1 = "eu-central-1";
6777

78+
/**
79+
* EU (Zurich)
80+
*/
81+
public static final String EU_CENTRAL_2 = "eu-central-2";
82+
6883
/**
6984
* EU (Stockholm)
7085
*/
@@ -167,48 +182,58 @@ public class Region {
167182

168183

169184
public static final Set<String> DEFAULT_S3 = ImmutableSet.of(US_STANDARD, US_EAST_2, US_WEST_1, US_WEST_2,
170-
CA_CENTRAL_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, SA_EAST_1, AP_SOUTHEAST_1,
171-
AP_SOUTHEAST_2,
172-
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1, ME_SOUTH_1);
185+
CA_CENTRAL_1, SA_EAST_1,
186+
EU_SOUTH_1, EU_SOUTH_2, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_CENTRAL_2, EU_NORTH_1,
187+
AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2,
188+
CN_NORTH_1, CN_NORTHWEST_1, ME_SOUTH_1);
173189

174190
public static final Set<String> DEFAULT_REGIONS = ImmutableSet.of(US_EAST_1, US_EAST_2, US_WEST_1, US_WEST_2,
175-
CA_CENTRAL_1, SA_EAST_1, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_NORTH_1, AP_SOUTHEAST_1,
176-
AP_SOUTHEAST_2,
177-
AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2, CN_NORTH_1, CN_NORTHWEST_1, ME_SOUTH_1);
191+
CA_CENTRAL_1, SA_EAST_1,
192+
EU_SOUTH_1, EU_SOUTH_2, EU_WEST_1, EU_WEST_2, EU_WEST_3, EU_CENTRAL_1, EU_CENTRAL_2, EU_NORTH_1,
193+
AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTH_1, AP_NORTHEAST_1, AP_NORTHEAST_2,
194+
CN_NORTH_1, CN_NORTHWEST_1, ME_SOUTH_1);
178195

179196
public static Properties regionPropertiesS3() {
180197

181198
Properties properties = regionProperties();
182199
properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_S3));
183200
// note that due to US_STANDARD the codes include US instead of US-VA
184-
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,"
185-
+ "AU-NSW,"
186-
+ "IN-MH,JP-13,KR-11,CN-BJ,CN-NX,BH");
201+
properties.setProperty(PROPERTY_ISO3166_CODES, "US,US-OH,US-CA,US-OR,CA,BR-SP,"
202+
+ "IE,GB-LND,FR-IDF,IT-MI,ES,DE-HE,CH-ZH,SE-AB,"
203+
+ "SG,AU-NSW,IN-MH,JP-13,KR-11,CN-BJ,CN-NX,BH");
187204
properties.setProperty(PROPERTY_REGION + "." + US_STANDARD + "." + ISO3166_CODES, "US");
188205
return properties;
189206
}
190207

191208
public static Properties regionProperties() {
192209
Properties properties = new Properties();
193210
properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(DEFAULT_REGIONS));
194-
properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-OH,US-CA,US-OR,CA,BR-SP,IE,GB-LND,FR-IDF,DE-HE,SG,"
195-
+ "AU-NSW,IN-MH,JP-13,KR-11,CN-BJ,CN-NX,BH");
211+
properties.setProperty(PROPERTY_ISO3166_CODES, "US-VA,US-OH,US-CA,US-OR,CA,BR-SP,"
212+
+ "IE,GB-LND,FR-IDF,IT-MI,ES,DE-HE,CH-ZH,SE-AB"
213+
+ "SG,AU-NSW,IN-MH,JP-13,KR-11,"
214+
+ "CN-BJ,CN-NX,BH");
196215
properties.setProperty(PROPERTY_REGION + "." + US_EAST_1 + "." + ISO3166_CODES, "US-VA");
197216
properties.setProperty(PROPERTY_REGION + "." + US_EAST_2 + "." + ISO3166_CODES, "US-OH");
198217
properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ISO3166_CODES, "US-CA");
199218
properties.setProperty(PROPERTY_REGION + "." + US_WEST_2 + "." + ISO3166_CODES, "US-OR");
200219
properties.setProperty(PROPERTY_REGION + "." + CA_CENTRAL_1 + "." + ISO3166_CODES, "CA");
201220
properties.setProperty(PROPERTY_REGION + "." + SA_EAST_1 + "." + ISO3166_CODES, "BR-SP");
221+
202222
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ISO3166_CODES, "IE");
203223
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ISO3166_CODES, "GB-LND");
204224
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ISO3166_CODES, "FR-IDF");
225+
properties.setProperty(PROPERTY_REGION + "." + EU_SOUTH_1 + "." + ISO3166_CODES, "IT-MI");
226+
properties.setProperty(PROPERTY_REGION + "." + EU_SOUTH_2 + "." + ISO3166_CODES, "ES");
205227
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ISO3166_CODES, "DE-HE");
228+
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_2 + "." + ISO3166_CODES, "CH-ZH");
206229
properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ISO3166_CODES, "SE-AB");
230+
207231
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ISO3166_CODES, "SG");
208232
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ISO3166_CODES, "AU-NSW");
209233
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTH_1 + "." + ISO3166_CODES, "IN-MH");
210234
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_1 + "." + ISO3166_CODES, "JP-13");
211235
properties.setProperty(PROPERTY_REGION + "." + AP_NORTHEAST_2 + "." + ISO3166_CODES, "KR-11");
236+
212237
properties.setProperty(PROPERTY_REGION + "." + CN_NORTH_1 + "." + ISO3166_CODES, "CN-BJ");
213238
properties.setProperty(PROPERTY_REGION + "." + CN_NORTHWEST_1 + "." + ISO3166_CODES, "CN-NX");
214239
properties.setProperty(PROPERTY_REGION + "." + ME_SOUTH_1 + "." + ISO3166_CODES, "BH");

‎providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,10 @@ public void testAssignability() {
353353

354354
@Override
355355
protected Set<String> getIso3166Codes() {
356-
return ImmutableSet.of("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE",
357-
"SE-AB", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX", "BH");
356+
return ImmutableSet.of("US-VA", "US-OH", "US-CA", "US-OR", "CA", "BR-SP",
357+
"IE", "GB-LND", "FR-IDF", "IT-MI", "ES", "DE-HE", "CH-ZH", "SE-AB",
358+
"SG", "AU-NSW", "IN-MH", "JP-13", "KR-11",
359+
"CN-BJ", "CN-NX", "BH");
358360
}
359361

360362
}

‎providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
import static org.jclouds.aws.domain.Region.CN_NORTHWEST_1;
2727
import static org.jclouds.aws.domain.Region.CN_NORTH_1;
2828
import static org.jclouds.aws.domain.Region.EU_CENTRAL_1;
29+
import static org.jclouds.aws.domain.Region.EU_CENTRAL_2;
2930
import static org.jclouds.aws.domain.Region.EU_NORTH_1;
31+
import static org.jclouds.aws.domain.Region.EU_SOUTH_1;
32+
import static org.jclouds.aws.domain.Region.EU_SOUTH_2;
3033
import static org.jclouds.aws.domain.Region.EU_WEST_1;
3134
import static org.jclouds.aws.domain.Region.EU_WEST_2;
3235
import static org.jclouds.aws.domain.Region.EU_WEST_3;
@@ -81,14 +84,17 @@ public static Properties defaultProperties() {
8184
properties.setProperty(PROPERTY_REGION + "." + US_WEST_1 + "." + ENDPOINT, "https://s3-us-west-1.amazonaws.com");
8285
properties.setProperty(PROPERTY_REGION + "." + US_WEST_2 + "." + ENDPOINT, "https://s3-us-west-2.amazonaws.com");
8386
properties.setProperty(PROPERTY_REGION + "." + CA_CENTRAL_1 + "." + ENDPOINT, "https://s3-ca-central-1.amazonaws.com");
84-
properties.setProperty(PROPERTY_REGION + "." + ME_SOUTH_1 + "." + ENDPOINT, "https://s3.me-south-1.amazonaws.com");
8587
properties.setProperty(PROPERTY_REGION + "." + SA_EAST_1 + "." + ENDPOINT, "https://s3-sa-east-1.amazonaws.com");
86-
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ENDPOINT,
87-
"https://s3-eu-central-1.amazonaws.com");
88+
8889
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_1 + "." + ENDPOINT, "https://s3-eu-west-1.amazonaws.com");
8990
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_2 + "." + ENDPOINT, "https://s3-eu-west-2.amazonaws.com");
9091
properties.setProperty(PROPERTY_REGION + "." + EU_WEST_3 + "." + ENDPOINT, "https://s3-eu-west-3.amazonaws.com");
92+
properties.setProperty(PROPERTY_REGION + "." + EU_SOUTH_1 + "." + ENDPOINT, "https://s3-eu-south-1.amazonaws.com");
93+
properties.setProperty(PROPERTY_REGION + "." + EU_SOUTH_2 + "." + ENDPOINT, "https://s3-eu-south-2.amazonaws.com");
94+
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_1 + "." + ENDPOINT, "https://s3-eu-central-1.amazonaws.com");
95+
properties.setProperty(PROPERTY_REGION + "." + EU_CENTRAL_2 + "." + ENDPOINT, "https://s3-eu-central-2.amazonaws.com");
9196
properties.setProperty(PROPERTY_REGION + "." + EU_NORTH_1 + "." + ENDPOINT, "https://s3-eu-north-1.amazonaws.com");
97+
9298
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_1 + "." + ENDPOINT,
9399
"https://s3-ap-southeast-1.amazonaws.com");
94100
properties.setProperty(PROPERTY_REGION + "." + AP_SOUTHEAST_2 + "." + ENDPOINT,
@@ -103,6 +109,7 @@ public static Properties defaultProperties() {
103109
"https://s3.cn-north-1.amazonaws.com.cn");
104110
properties.setProperty(PROPERTY_REGION + "." + CN_NORTHWEST_1 + "." + ENDPOINT,
105111
"https://s3.cn-north-s3.cn-northwest-1.amazonaws.com.cn");
112+
properties.setProperty(PROPERTY_REGION + "." + ME_SOUTH_1 + "." + ENDPOINT, "https://s3.me-south-1.amazonaws.com");
106113
return properties;
107114
}
108115

@@ -115,9 +122,10 @@ protected Builder() {
115122
.homepage(URI.create("http://aws.amazon.com/s3"))
116123
.console(URI.create("https://console.aws.amazon.com/s3/home"))
117124
.linkedServices("aws-ec2", "aws-elb", "aws-cloudwatch", "aws-s3", "aws-simpledb")
118-
.iso3166Codes("US", "US-OH", "US-CA", "US-OR", "CA", "BR-SP", "IE", "GB-LND", "FR-IDF", "DE-HE", "SE"
119-
+ "-AB", "SG",
120-
"AU-NSW", "IN-MH", "JP-13", "KR-11", "CN-BJ", "CN-NX", "BH")
125+
.iso3166Codes("US", "US-OH", "US-CA", "US-OR", "CA", "BR-SP",
126+
"IE", "GB-LND", "FR-IDF", "IT-MI", "ES", "DE-HE", "CH-ZH", "SE-AB",
127+
"SG", "AU-NSW", "IN-MH", "JP-13", "KR-11",
128+
"CN-BJ", "CN-NX", "BH")
121129
.defaultProperties(AWSS3ProviderMetadata.defaultProperties());
122130
}
123131

‎providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/integration/AWSS3ServiceIntegrationLiveTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,19 @@ protected Set<String> getIso3166Codes() {
3737
"BH",
3838
"BR-SP",
3939
"CA",
40+
"CH-ZH",
4041
"CN-BJ",
4142
"CN-NX",
4243
"DE-HE",
43-
"SE-AB",
44-
"GB-LND",
44+
"ES",
4545
"FR-IDF",
46+
"GB-LND",
4647
"IE",
4748
"IN-MH",
49+
"IT-MI",
4850
"JP-13",
4951
"KR-11",
52+
"SE-AB",
5053
"SG",
5154
"US",
5255
"US-CA",

0 commit comments

Comments
 (0)