From 53119dac6de19803d62ec095895b04bd8951353e Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Thu, 18 Nov 2021 10:39:10 -0800
Subject: [PATCH] Add customization for EC2 legacy dualstack endpoints (#3967)

---
 .changes/next-release/bugfix-EC2-a3dc85ca.json |  5 +++++
 lib/region_config_data.json                    | 13 ++++++++++++-
 test/endpoint/test_cases_supported.json        |  8 ++++++++
 test/endpoint/test_cases_unsupported.json      |  8 --------
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 .changes/next-release/bugfix-EC2-a3dc85ca.json

diff --git a/.changes/next-release/bugfix-EC2-a3dc85ca.json b/.changes/next-release/bugfix-EC2-a3dc85ca.json
new file mode 100644
index 0000000000..4b882d7663
--- /dev/null
+++ b/.changes/next-release/bugfix-EC2-a3dc85ca.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "EC2",
+  "description": "Add customization for EC2 legacy dualstack endpoints"
+}
\ No newline at end of file
diff --git a/lib/region_config_data.json b/lib/region_config_data.json
index ed2d9e80e9..c0c0108e5e 100644
--- a/lib/region_config_data.json
+++ b/lib/region_config_data.json
@@ -127,10 +127,18 @@
     "cn-*/*": {
       "endpoint": "{service}.{region}.api.amazonwebservices.com.cn"
     },
+
     "*/s3": "dualstackLegacy",
     "cn-*/s3": "dualstackLegacyCn",
     "*/s3-control": "dualstackLegacy",
-    "cn-*/s3-control": "dualstackLegacyCn"
+    "cn-*/s3-control": "dualstackLegacyCn",
+
+    "ap-south-1/ec2": "dualstackLegacyEc2",
+    "eu-west-1/ec2": "dualstackLegacyEc2",
+    "sa-east-1/ec2": "dualstackLegacyEc2",
+    "us-east-1/ec2": "dualstackLegacyEc2",
+    "us-east-2/ec2": "dualstackLegacyEc2",
+    "us-west-2/ec2": "dualstackLegacyEc2"
   },
 
   "dualstackFipsRules": {
@@ -202,6 +210,9 @@
     },
     "dualstackFipsLegacyCn": {
       "endpoint": "{service}-fips.dualstack.{region}.amazonaws.com.cn"
+    },
+    "dualstackLegacyEc2": {
+      "endpoint": "api.ec2.{region}.aws"
     }
   }
 }
diff --git a/test/endpoint/test_cases_supported.json b/test/endpoint/test_cases_supported.json
index 679b6daf70..26d5d3c4db 100644
--- a/test/endpoint/test_cases_supported.json
+++ b/test/endpoint/test_cases_supported.json
@@ -2439,6 +2439,14 @@
     "useDualstackEndpoint": false,
     "hostname": "ec2-fips.af-south-1.amazonaws.com"
   },
+  {
+    "endpointPrefix": "ec2",
+    "clientName": "EC2",
+    "region": "ap-south-1",
+    "useFipsEndpoint": false,
+    "useDualstackEndpoint": true,
+    "hostname": "api.ec2.ap-south-1.aws"
+  },
   {
     "endpointPrefix": "ec2",
     "clientName": "EC2",
diff --git a/test/endpoint/test_cases_unsupported.json b/test/endpoint/test_cases_unsupported.json
index e648014512..82b6b1cfba 100644
--- a/test/endpoint/test_cases_unsupported.json
+++ b/test/endpoint/test_cases_unsupported.json
@@ -80,14 +80,6 @@
     "useDualstackEndpoint": false,
     "hostname": "data.iot-fips.us-gov-east-1.amazonaws.com"
   },
-  {
-    "endpointPrefix": "ec2",
-    "clientName": "EC2",
-    "region": "ap-south-1",
-    "useFipsEndpoint": false,
-    "useDualstackEndpoint": true,
-    "hostname": "api.ec2.ap-south-1.aws"
-  },
   {
     "endpointPrefix": "dms",
     "clientName": "DMS",