From 701c26f7d7992e60fb72acd083e52532ca4f102b Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Wed, 10 Nov 2021 04:25:40 +0000
Subject: [PATCH 1/3] test(endpoint): remove deprecated accesspoint pseudo
 regions

---
 test/endpoint/fips/test_cases_supported.json | 49 --------------------
 1 file changed, 49 deletions(-)

diff --git a/test/endpoint/fips/test_cases_supported.json b/test/endpoint/fips/test_cases_supported.json
index 6b859af93f..ef12b75ad3 100644
--- a/test/endpoint/fips/test_cases_supported.json
+++ b/test/endpoint/fips/test_cases_supported.json
@@ -2281,41 +2281,6 @@
     "signingRegion": "us-west-2",
     "hostname": "runtime-fips.sagemaker.us-west-2.amazonaws.com"
   },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-ca-central-1",
-    "signingRegion": "ca-central-1",
-    "hostname": "s3-accesspoint-fips.ca-central-1.amazonaws.com"
-  },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-east-1",
-    "signingRegion": "us-east-1",
-    "hostname": "s3-accesspoint-fips.us-east-1.amazonaws.com"
-  },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-east-2",
-    "signingRegion": "us-east-2",
-    "hostname": "s3-accesspoint-fips.us-east-2.amazonaws.com"
-  },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-west-1",
-    "signingRegion": "us-west-1",
-    "hostname": "s3-accesspoint-fips.us-west-1.amazonaws.com"
-  },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-west-2",
-    "signingRegion": "us-west-2",
-    "hostname": "s3-accesspoint-fips.us-west-2.amazonaws.com"
-  },
   {
     "endpointPrefix": "s3-control",
     "clientName": "S3Control",
@@ -3807,20 +3772,6 @@
     "signingRegion": "us-gov-west-1",
     "hostname": "runtime.sagemaker.us-gov-west-1.amazonaws.com"
   },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-gov-east-1",
-    "signingRegion": "us-gov-east-1",
-    "hostname": "s3-accesspoint-fips.us-gov-east-1.amazonaws.com"
-  },
-  {
-    "endpointPrefix": "s3",
-    "clientName": "S3",
-    "region": "fips-accesspoint-us-gov-west-1",
-    "signingRegion": "us-gov-west-1",
-    "hostname": "s3-accesspoint-fips.us-gov-west-1.amazonaws.com"
-  },
   {
     "endpointPrefix": "s3",
     "clientName": "S3",

From 6e52839cc64cf5de37832811907c8636e7574782 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Wed, 10 Nov 2021 04:40:30 +0000
Subject: [PATCH 2/3] chore(region_config): remove support for unused
 accesspoint pseudo regions

---
 lib/region_config.js        | 3 +--
 lib/region_config_data.json | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/region_config.js b/lib/region_config.js
index 1aad6f5723..82c6fccfd1 100644
--- a/lib/region_config.js
+++ b/lib/region_config.js
@@ -6,7 +6,6 @@ function generateRegionPrefix(region) {
   if (isFipsRegion(region)) {
     if (isFipsCnRegion(region)) return 'fips-cn-*';
     if (isFipsUsGovRegion(region)) return 'fips-us-gov-*';
-    if (region.startsWith('fips-accesspoint-')) return 'fips-accesspoint-*';
     return 'fips-*';
   }
 
@@ -128,7 +127,7 @@ function getRealRegion(region) {
       ? 'us-east-1'
       : region === 'fips-aws-us-gov-global'
       ? 'us-gov-west-1'
-      : region.replace(/fips-(dkr-|prod-|accesspoint-)?|-fips/, '')
+      : region.replace(/fips-(dkr-|prod-)?|-fips/, '')
     : region;
 }
 
diff --git a/lib/region_config_data.json b/lib/region_config_data.json
index 5e916522eb..9a65bc0eec 100644
--- a/lib/region_config_data.json
+++ b/lib/region_config_data.json
@@ -88,9 +88,6 @@
     "fips-*/transcribe": "fipsDotPrefix",
     "fips-us-gov-*/transcribe": "fipsDotPrefix",
     "fips-*/waf": "fipsWithoutRegion",
-    "fips-accesspoint-*/*": {
-      "endpoint": "{service}-accesspoint-fips.{region}.amazonaws.com"
-    },
     "fips-us-gov-*/acm-pca": "fipsWithServiceOnly",
     "fips-us-gov-*/batch": "fipsWithServiceOnly",
     "fips-us-gov-*/config": "fipsWithServiceOnly",

From 3d817da0244fe8130c04d6762111c77f76413fa8 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Wed, 10 Nov 2021 04:59:34 +0000
Subject: [PATCH 3/3] chore: update region-checker allowlist

---
 scripts/region-checker/allowlist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/region-checker/allowlist.js b/scripts/region-checker/allowlist.js
index a5e56770ab..853e12d947 100644
--- a/scripts/region-checker/allowlist.js
+++ b/scripts/region-checker/allowlist.js
@@ -28,7 +28,7 @@ var allowlist = {
         112
     ],
     '/region_config.js': [
-        127
+        126
     ],
     '/request.js': [
         318,