Skip to content

Commit 91a7b9d

Browse files
Karthikeyanpalpatim
authored andcommitted
Support me-south-1 region (#1098)
* Support me-south-1 region
1 parent 23c8cb6 commit 91a7b9d

File tree

5 files changed

+48
-4
lines changed

5 files changed

+48
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Change Log - AWS SDK for Android
2-
2+
33
## [Release 2.14.1](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.14.1)
44

5+
### New Features
6+
7+
- **AWS Core Runtime**
8+
- Added support for `me-south-1` - Middle East (Bahrain) region.
9+
510
### Bug Fixes
611
- **AWS Core Runtime**
712
- Fixed response unmarshalling when response is gzip encoded without a CRC32 checksum. Also fixes bug decoding Kinesis responses with GZIP encoding.

aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,33 @@ public static List<Region> getRegions() {
459459
updateRegion(region, "sqs", "sqs.ap-east-1.amazonaws.com", false, true);
460460
updateRegion(region, "sts", "sts.amazonaws.com", false, true);
461461

462+
// Support Middle East (Bahrain) `me-south-1` region
463+
region = new Region("me-south-1", "amazonaws.com");
464+
ret.add(region);
465+
updateRegion(region, "autoscaling", "autoscaling.me-south-1.amazonaws.com", false, true);
466+
updateRegion(region, "cognito-identity", "cognito-identity.me-south-1.amazonaws.com",
467+
false, true);
468+
updateRegion(region, "cognito-idp", "cognito-idp.me-south-1.amazonaws.com", false, true);
469+
updateRegion(region, "cognito-sync", "cognito-sync.me-south-1.amazonaws.com", false,
470+
true);
471+
updateRegion(region, "data.iot", "data.iot.me-south-1.amazonaws.com", false, true);
472+
updateRegion(region, "dynamodb", "dynamodb.me-south-1.amazonaws.com", false, true);
473+
updateRegion(region, "ec2", "ec2.me-south-1.amazonaws.com", false, true);
474+
updateRegion(region, "elasticloadbalancing",
475+
"elasticloadbalancing.me-south-1.amazonaws.com", false, true);
476+
updateRegion(region, "firehose", "firehose.me-south-1.amazonaws.com", false, true);
477+
updateRegion(region, "iot", "iot.me-south-1.amazonaws.com", false, true);
478+
updateRegion(region, "kinesis", "kinesis.me-south-1.amazonaws.com", false, true);
479+
updateRegion(region, "kms", "kms.me-south-1.amazonaws.com", false, true);
480+
updateRegion(region, "lambda", "lambda.me-south-1.amazonaws.com", false, true);
481+
updateRegion(region, "logs", "logs.me-south-1.amazonaws.com", false, true);
482+
updateRegion(region, "polly", "polly.me-south-1.amazonaws.com", false, true);
483+
updateRegion(region, "s3", "s3.me-south-1.amazonaws.com", false, true);
484+
updateRegion(region, "sdb", "sdb.me-south-1.amazonaws.com", false, true);
485+
updateRegion(region, "sns", "sns.me-south-1.amazonaws.com", false, true);
486+
updateRegion(region, "sqs", "sqs.me-south-1.amazonaws.com", false, true);
487+
updateRegion(region, "sts", "sts.amazonaws.com", false, true);
488+
462489
return ret;
463490
}
464491

aws-android-sdk-core/src/main/java/com/amazonaws/regions/Regions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ public enum Regions {
8181
CN_NORTH_1("cn-north-1"),
8282

8383
/** cn-northwest-1. */
84-
CN_NORTHWEST_1("cn-northwest-1");
84+
CN_NORTHWEST_1("cn-northwest-1"),
85+
86+
/** me-south-1. */
87+
ME_SOUTH_1("me-south-1");
8588

8689
/**
8790
* The default region that new customers in the US are encouraged to use

aws-android-sdk-core/src/test/java/com/amazonaws/regions/RegionUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testGetRegionByEndpointWithBogusEndpoint() {
4646
@Test
4747
public void testGetRegionsForService() {
4848
List<Region> regions = RegionUtils.getRegionsForService(ServiceAbbreviations.SimpleDB);
49-
assertEquals(regions.size(), 8);
49+
assertEquals(regions.size(), 9);
5050
boolean usEast1 = false;
5151
boolean usWest1 = false;
5252
for (Region curr : regions) {

aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/model/Region.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,16 @@ public enum Region {
281281
* When using buckets in this region, you must set the client endpoint to
282282
* <code>s3.cn-northwest-1.amazonaws.com.cn</code>.
283283
*/
284-
CN_Ningxia("cn-northwest-1");
284+
CN_Ningxia("cn-northwest-1"),
285+
286+
/**
287+
* The Middle East (Bahrain) Region. This region uses Amazon S3 servers located in
288+
* Bahrain.
289+
* <p>
290+
* When using buckets in this region, you must set the client endpoint to
291+
* <code>s3.me-south-1.amazonaws.com</code>.
292+
*/
293+
ME_Bahrain("me-south-1");
285294

286295
/**
287296
* Used to extract the S3 regional id from an S3 end point. Note this

0 commit comments

Comments
 (0)