added mel region (#3173)

Co-authored-by: Banji Jolaoso <banjij@amazon.com>
aws-amplify · Jan 24, 2023 · a45180f · a45180f
1 parent 300b9ad
commit a45180f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java
@@ -651,6 +651,32 @@ public static List<Region> getRegions() {
         updateRegion(region, "sts", "sts.ap-south-2.amazonaws.com", false, true);
 
 
+        // Support for Asia Pacific (Melbourne) `ap-southeast-4` region
+        region = new Region("ap-southeast-4", "amazonaws.com");
+        ret.add(region);
+        updateRegion(region, "autoscaling", "autoscaling.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "cognito-identity", "cognito-identity.ap-southeast-4.amazonaws.com",
+                false, true);
+        updateRegion(region, "cognito-idp", "cognito-idp.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "cognito-sync", "cognito-sync.ap-southeast-4.amazonaws.com", false,
+                true);
+        updateRegion(region, "data.iot", "data.iot.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "dynamodb", "dynamodb.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "ec2", "ec2.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "elasticloadbalancing",
+                "elasticloadbalancing.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "firehose", "firehose.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "iot", "iot.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "kinesis", "kinesis.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "kms", "kms.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "lambda", "lambda.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "logs", "logs.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "polly", "polly.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "s3", "s3.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "sdb", "sdb.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "sns", "sns.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "sqs", "sqs.ap-southeast-4.amazonaws.com", false, true);
+        updateRegion(region, "sts", "sts.ap-southeast-4.amazonaws.com", false, true);
         return ret;
     }
 

diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Regions.java b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Regions.java
@@ -74,6 +74,9 @@ public enum Regions {
     /** ap-southeast-2. */
     AP_SOUTHEAST_2("ap-southeast-2"),
 
+    /** ap-southeast-4. */
+    AP_SOUTHEAST_4("ap-southeast-4"),
+
     /** ap-northeast-1. */
     AP_NORTHEAST_1("ap-northeast-1"),
 

diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/regions/RegionUtilsTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/regions/RegionUtilsTest.java
@@ -46,7 +46,7 @@ public void testGetRegionByEndpointWithBogusEndpoint() {
     @Test
     public void testGetRegionsForService() {
         List<Region> regions = RegionUtils.getRegionsForService(ServiceAbbreviations.SimpleDB);
-        assertEquals(regions.size(), 14);
+        assertEquals(regions.size(), 15);
         boolean usEast1 = false;
         boolean usWest1 = false;
         for (Region curr : regions) {

diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/model/Region.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/services/s3/model/Region.java
@@ -374,7 +374,19 @@ public enum Region {
      * bucket in this region.
      * </p>
      */
-    AP_HYD("ap-south-2");
+    AP_HYD("ap-south-2"),
+
+    /**
+     * The Asia Pacific (Melbourne) Region. This region uses Amazon S3 servers
+     * located in Melbourne.
+     * <p>
+     * When using buckets in this region, set the client endpoint to
+     * <code>s3-ap-southeast-4.amazonaws.com</code> on all requests to these buckets
+     * to reduce any latency experienced after the first hour of creating a
+     * bucket in this region.
+     * </p>
+     */
+    AP_Melbourne("ap-southeast-4");
 
     /**
      * Used to extract the S3 regional id from an S3 end point. Note this