Add endpoint customizations for services which do not use FIPS suffix (…

…#4544)
aws · Dec 7, 2023 · 28a4e42 · 28a4e42
1 parent b662689
commit 28a4e42
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 19 deletions.
diff --git a/.changes/next-release/bugfix-Endpoints-53e779cb.json b/.changes/next-release/bugfix-Endpoints-53e779cb.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "Endpoints",
+  "description": "Add endpoint customizations for services which do not use FIPS suffix"
+}
diff --git a/lib/region_config_data.json b/lib/region_config_data.json
@@ -121,28 +121,65 @@
 
     "us-gov-*/transcribe": "fipsDotPrefix",
     "us-gov-*/api.ecr": "fips.api.ecr",
-    "us-gov-*/api.sagemaker": "fips.api.sagemaker",
     "us-gov-*/models.lex": "fips.models.lex",
     "us-gov-*/runtime.lex": "fips.runtime.lex",
+    "us-gov-*/access-analyzer": "fipsWithServiceOnly",
+    "us-gov-*/acm": "fipsWithServiceOnly",
     "us-gov-*/acm-pca": "fipsWithServiceOnly",
+    "us-gov-*/api.sagemaker": "fipsWithServiceOnly",
+    "us-gov-*/appconfig": "fipsWithServiceOnly",
+    "us-gov-*/application-autoscaling": "fipsWithServiceOnly",
+    "us-gov-*/autoscaling": "fipsWithServiceOnly",
+    "us-gov-*/autoscaling-plans": "fipsWithServiceOnly",
     "us-gov-*/batch": "fipsWithServiceOnly",
+    "us-gov-*/cassandra": "fipsWithServiceOnly",
+    "us-gov-*/clouddirectory": "fipsWithServiceOnly",
     "us-gov-*/cloudformation": "fipsWithServiceOnly",
+    "us-gov-*/cloudshell": "fipsWithServiceOnly",
+    "us-gov-*/cloudtrail": "fipsWithServiceOnly",
     "us-gov-*/config": "fipsWithServiceOnly",
+    "us-gov-*/connect": "fipsWithServiceOnly",
+    "us-gov-*/databrew": "fipsWithServiceOnly",
+    "us-gov-*/dlm": "fipsWithServiceOnly",
+    "us-gov-*/dms": "fipsWithServiceOnly",
+    "us-gov-*/dynamodb": "fipsWithServiceOnly",
     "us-gov-*/ec2": "fipsWithServiceOnly",
     "us-gov-*/eks": "fipsWithServiceOnly",
-    "us-gov-*/elasticmapreduce": "fipsWithServiceOnly",
-    "us-gov-*/identitystore": "fipsWithServiceOnly",
-    "us-gov-*/dynamodb": "fipsWithServiceOnly",
+    "us-gov-*/elasticache": "fipsWithServiceOnly",
+    "us-gov-*/elasticbeanstalk": "fipsWithServiceOnly",
     "us-gov-*/elasticloadbalancing": "fipsWithServiceOnly",
+    "us-gov-*/elasticmapreduce": "fipsWithServiceOnly",
+    "us-gov-*/events": "fipsWithServiceOnly",
+    "us-gov-*/fis": "fipsWithServiceOnly",
+    "us-gov-*/glacier": "fipsWithServiceOnly",
+    "us-gov-*/greengrass": "fipsWithServiceOnly",
     "us-gov-*/guardduty": "fipsWithServiceOnly",
+    "us-gov-*/identitystore": "fipsWithServiceOnly",
+    "us-gov-*/imagebuilder": "fipsWithServiceOnly",
+    "us-gov-*/kafka": "fipsWithServiceOnly",
+    "us-gov-*/kinesis": "fipsWithServiceOnly",
+    "us-gov-*/logs": "fipsWithServiceOnly",
+    "us-gov-*/mediaconvert": "fipsWithServiceOnly",
     "us-gov-*/monitoring": "fipsWithServiceOnly",
+    "us-gov-*/networkmanager": "fipsWithServiceOnly",
+    "us-gov-*/organizations": "fipsWithServiceOnly",
+    "us-gov-*/outposts": "fipsWithServiceOnly",
+    "us-gov-*/participant.connect": "fipsWithServiceOnly",
+    "us-gov-*/ram": "fipsWithServiceOnly",
+    "us-gov-*/rds": "fipsWithServiceOnly",
+    "us-gov-*/redshift": "fipsWithServiceOnly",
     "us-gov-*/resource-groups": "fipsWithServiceOnly",
     "us-gov-*/runtime.sagemaker": "fipsWithServiceOnly",
+    "us-gov-*/serverlessrepo": "fipsWithServiceOnly",
     "us-gov-*/servicecatalog-appregistry": "fipsWithServiceOnly",
     "us-gov-*/servicequotas": "fipsWithServiceOnly",
+    "us-gov-*/sns": "fipsWithServiceOnly",
+    "us-gov-*/sqs": "fipsWithServiceOnly",
     "us-gov-*/ssm": "fipsWithServiceOnly",
+    "us-gov-*/streams.dynamodb": "fipsWithServiceOnly",
     "us-gov-*/sts": "fipsWithServiceOnly",
     "us-gov-*/support": "fipsWithServiceOnly",
+    "us-gov-*/swf": "fipsWithServiceOnly",
     "us-gov-west-1/states": "fipsWithServiceOnly",
     "us-iso-east-1/elasticfilesystem": {
       "endpoint": "elasticfilesystem-fips.{region}.c2s.ic.gov"

diff --git a/test/endpoint/fips/test_cases_supported.json b/test/endpoint/fips/test_cases_supported.json
@@ -2769,7 +2769,7 @@
     "endpointPrefix": "api.sagemaker",
     "clientName": "SageMaker",
     "region": "us-gov-west-1-fips",
-    "hostname": "api-fips.sagemaker.us-gov-west-1.amazonaws.com"
+    "hostname": "api.sagemaker.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "athena",
@@ -3039,7 +3039,7 @@
     "endpointPrefix": "greengrass",
     "clientName": "GreengrassV2",
     "region": "fips-us-gov-east-1",
-    "hostname": "greengrass-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "greengrass.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "guardduty",
@@ -3351,13 +3351,13 @@
     "endpointPrefix": "streams.dynamodb",
     "clientName": "DynamoDBStreams",
     "region": "us-gov-east-1-fips",
-    "hostname": "streams.dynamodb-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "streams.dynamodb.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "streams.dynamodb",
     "clientName": "DynamoDBStreams",
     "region": "us-gov-west-1-fips",
-    "hostname": "streams.dynamodb-fips.us-gov-west-1.amazonaws.com"
+    "hostname": "streams.dynamodb.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "sts",

diff --git a/test/endpoint/test_cases_supported.json b/test/endpoint/test_cases_supported.json
@@ -9893,7 +9893,7 @@
     "region": "us-gov-west-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "api-fips.sagemaker.us-gov-west-1.amazonaws.com"
+    "hostname": "api.sagemaker.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "apigateway",
@@ -9949,7 +9949,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "application-autoscaling-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "application-autoscaling.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "application-autoscaling",
@@ -9997,7 +9997,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "autoscaling-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "autoscaling.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "autoscaling",
@@ -10029,7 +10029,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "autoscaling-plans-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "autoscaling-plans.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "autoscaling-plans",
@@ -10109,7 +10109,7 @@
     "region": "us-gov-west-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "clouddirectory-fips.us-gov-west-1.amazonaws.com"
+    "hostname": "clouddirectory.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "clouddirectory",
@@ -10277,7 +10277,7 @@
     "region": "us-gov-west-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "connect-fips.us-gov-west-1.amazonaws.com"
+    "hostname": "connect.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "connect",
@@ -10317,7 +10317,7 @@
     "region": "us-gov-west-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "databrew-fips.us-gov-west-1.amazonaws.com"
+    "hostname": "databrew.us-gov-west-1.amazonaws.com"
   },
   {
     "endpointPrefix": "databrew",
@@ -10485,7 +10485,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "greengrass-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "greengrass.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "guardduty",
@@ -10605,7 +10605,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "kafka-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "kafka.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "kafka",
@@ -11029,7 +11029,7 @@
     "region": "us-gov-east-1",
     "useFipsEndpoint": true,
     "useDualstackEndpoint": false,
-    "hostname": "streams.dynamodb-fips.us-gov-east-1.amazonaws.com"
+    "hostname": "streams.dynamodb.us-gov-east-1.amazonaws.com"
   },
   {
     "endpointPrefix": "streams.dynamodb",
@@ -11871,4 +11871,4 @@
     "useDualstackEndpoint": false,
     "hostname": "tagging.us-isob-east-1.sc2s.sgov.gov"
   }
-]
+]