Skip to content

Commit 873b376

Browse files
authored
Remove support for unused accesspoint pseudo regions (#3949)
* test(endpoint): remove deprecated accesspoint pseudo regions * chore(region_config): remove support for unused accesspoint pseudo regions * chore: update region-checker allowlist
1 parent a33cf12 commit 873b376

File tree

4 files changed

+2
-55
lines changed

4 files changed

+2
-55
lines changed

lib/region_config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ function generateRegionPrefix(region) {
66
if (isFipsRegion(region)) {
77
if (isFipsCnRegion(region)) return 'fips-cn-*';
88
if (isFipsUsGovRegion(region)) return 'fips-us-gov-*';
9-
if (region.startsWith('fips-accesspoint-')) return 'fips-accesspoint-*';
109
return 'fips-*';
1110
}
1211

@@ -128,7 +127,7 @@ function getRealRegion(region) {
128127
? 'us-east-1'
129128
: region === 'fips-aws-us-gov-global'
130129
? 'us-gov-west-1'
131-
: region.replace(/fips-(dkr-|prod-|accesspoint-)?|-fips/, '')
130+
: region.replace(/fips-(dkr-|prod-)?|-fips/, '')
132131
: region;
133132
}
134133

lib/region_config_data.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@
8888
"fips-*/transcribe": "fipsDotPrefix",
8989
"fips-us-gov-*/transcribe": "fipsDotPrefix",
9090
"fips-*/waf": "fipsWithoutRegion",
91-
"fips-accesspoint-*/*": {
92-
"endpoint": "{service}-accesspoint-fips.{region}.amazonaws.com"
93-
},
9491
"fips-us-gov-*/acm-pca": "fipsWithServiceOnly",
9592
"fips-us-gov-*/batch": "fipsWithServiceOnly",
9693
"fips-us-gov-*/config": "fipsWithServiceOnly",

scripts/region-checker/allowlist.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var allowlist = {
2828
112
2929
],
3030
'/region_config.js': [
31-
127
31+
126
3232
],
3333
'/request.js': [
3434
318,

test/endpoint/fips/test_cases_supported.json

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,41 +2281,6 @@
22812281
"signingRegion": "us-west-2",
22822282
"hostname": "runtime-fips.sagemaker.us-west-2.amazonaws.com"
22832283
},
2284-
{
2285-
"endpointPrefix": "s3",
2286-
"clientName": "S3",
2287-
"region": "fips-accesspoint-ca-central-1",
2288-
"signingRegion": "ca-central-1",
2289-
"hostname": "s3-accesspoint-fips.ca-central-1.amazonaws.com"
2290-
},
2291-
{
2292-
"endpointPrefix": "s3",
2293-
"clientName": "S3",
2294-
"region": "fips-accesspoint-us-east-1",
2295-
"signingRegion": "us-east-1",
2296-
"hostname": "s3-accesspoint-fips.us-east-1.amazonaws.com"
2297-
},
2298-
{
2299-
"endpointPrefix": "s3",
2300-
"clientName": "S3",
2301-
"region": "fips-accesspoint-us-east-2",
2302-
"signingRegion": "us-east-2",
2303-
"hostname": "s3-accesspoint-fips.us-east-2.amazonaws.com"
2304-
},
2305-
{
2306-
"endpointPrefix": "s3",
2307-
"clientName": "S3",
2308-
"region": "fips-accesspoint-us-west-1",
2309-
"signingRegion": "us-west-1",
2310-
"hostname": "s3-accesspoint-fips.us-west-1.amazonaws.com"
2311-
},
2312-
{
2313-
"endpointPrefix": "s3",
2314-
"clientName": "S3",
2315-
"region": "fips-accesspoint-us-west-2",
2316-
"signingRegion": "us-west-2",
2317-
"hostname": "s3-accesspoint-fips.us-west-2.amazonaws.com"
2318-
},
23192284
{
23202285
"endpointPrefix": "s3-control",
23212286
"clientName": "S3Control",
@@ -3807,20 +3772,6 @@
38073772
"signingRegion": "us-gov-west-1",
38083773
"hostname": "runtime.sagemaker.us-gov-west-1.amazonaws.com"
38093774
},
3810-
{
3811-
"endpointPrefix": "s3",
3812-
"clientName": "S3",
3813-
"region": "fips-accesspoint-us-gov-east-1",
3814-
"signingRegion": "us-gov-east-1",
3815-
"hostname": "s3-accesspoint-fips.us-gov-east-1.amazonaws.com"
3816-
},
3817-
{
3818-
"endpointPrefix": "s3",
3819-
"clientName": "S3",
3820-
"region": "fips-accesspoint-us-gov-west-1",
3821-
"signingRegion": "us-gov-west-1",
3822-
"hostname": "s3-accesspoint-fips.us-gov-west-1.amazonaws.com"
3823-
},
38243775
{
38253776
"endpointPrefix": "s3",
38263777
"clientName": "S3",

0 commit comments

Comments
 (0)