diff --git a/.changes/1.29.93.json b/.changes/1.29.93.json
new file mode 100644
index 0000000000..dfdfb7c75b
--- /dev/null
+++ b/.changes/1.29.93.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``guardduty``",
+    "description": "Updated 9 APIs for feature enablement to reflect expansion of GuardDuty to features. Added new APIs and updated existing APIs to support RDS Protection GA.",
+    "type": "api-change"
+  },
+  {
+    "category": "``resource-explorer-2``",
+    "description": "Documentation updates for APIs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker-runtime``",
+    "description": "Update sagemaker-runtime client to latest version",
+    "type": "api-change"
+  }
+]
\ No newline at end of file
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c3ef6d4c50..83e5f58c69 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.29.93
+=======
+
+* api-change:``guardduty``: Updated 9 APIs for feature enablement to reflect expansion of GuardDuty to features. Added new APIs and updated existing APIs to support RDS Protection GA.
+* api-change:``resource-explorer-2``: Documentation updates for APIs.
+* api-change:``sagemaker-runtime``: Update sagemaker-runtime client to latest version
+
+
 1.29.92
 =======
 
diff --git a/botocore/__init__.py b/botocore/__init__.py
index 8f6f6ef1e9..e0039b25ad 100644
--- a/botocore/__init__.py
+++ b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.29.92'
+__version__ = '1.29.93'
 
 
 class NullHandler(logging.Handler):
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
index d7ba532db9..f0d2de3cec 100644
--- a/botocore/data/endpoints.json
+++ b/botocore/data/endpoints.json
@@ -19194,8 +19194,32 @@
       },
       "dlm" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-gov-east-1" : {
+            "variants" : [ {
+              "hostname" : "dlm.us-gov-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "deprecated" : true,
+            "hostname" : "dlm.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "variants" : [ {
+              "hostname" : "dlm.us-gov-west-1.amazonaws.com",
+              "tags" : [ "fips" ]
+            } ]
+          },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "deprecated" : true,
+            "hostname" : "dlm.us-gov-west-1.amazonaws.com"
+          }
         }
       },
       "dms" : {
diff --git a/botocore/data/guardduty/2017-11-28/service-2.json b/botocore/data/guardduty/2017-11-28/service-2.json
index 7566ecd5cf..d569cbeed0 100644
--- a/botocore/data/guardduty/2017-11-28/service-2.json
+++ b/botocore/data/guardduty/2017-11-28/service-2.json
@@ -87,7 +87,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Creates a filter using the specified finding criteria.</p>"
+      "documentation":"<p>Creates a filter using the specified finding criteria. The maximum number of saved filters per Amazon Web Services account per Region is 100. For more information, see <a href=\"https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_limits.html\">Quotas for GuardDuty</a>.</p>"
     },
     "CreateIPSet":{
       "name":"CreateIPSet",
@@ -1140,7 +1140,14 @@
         "DataSources":{
           "shape":"DataSourcesFreeTrial",
           "documentation":"<p>Describes the data source enabled for the GuardDuty member account.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"FreeTrialFeatureConfigurationsResults",
+          "documentation":"<p>A list of features enabled for the GuardDuty account.</p>",
+          "locationName":"features"
         }
       },
       "documentation":"<p>Provides details of the GuardDuty member account that uses a free trial service.</p>"
@@ -1203,6 +1210,11 @@
           "shape":"KubernetesApiCallAction",
           "documentation":"<p>Information about the Kubernetes API call action described in this finding.</p>",
           "locationName":"kubernetesApiCallAction"
+        },
+        "RdsLoginAttemptAction":{
+          "shape":"RdsLoginAttemptAction",
+          "documentation":"<p>Information about <code>RDS_LOGIN_ATTEMPT</code> action described in this finding.</p>",
+          "locationName":"rdsLoginAttemptAction"
         }
       },
       "documentation":"<p>Contains information about actions.</p>"
@@ -1616,12 +1628,19 @@
         "DataSources":{
           "shape":"DataSourceConfigurations",
           "documentation":"<p>Describes which data sources will be enabled for the detector.</p> <p>There might be regional differences because some data sources might not be available in all the Amazon Web Services Regions where GuardDuty is presently supported. For more information, see <a href=\"https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_regions.html\">Regions and endpoints</a>.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
         },
         "Tags":{
           "shape":"TagMap",
           "documentation":"<p>The tags to be added to a new detector resource.</p>",
           "locationName":"tags"
+        },
+        "Features":{
+          "shape":"DetectorFeatureConfigurations",
+          "documentation":"<p>A list of features that will be configured for the detector.</p>",
+          "locationName":"features"
         }
       }
     },
@@ -1661,7 +1680,7 @@
         },
         "Description":{
           "shape":"FilterDescription",
-          "documentation":"<p>The description of the filter. Valid characters include alphanumeric characters, and special characters such as <code>-</code>, <code>.</code>, <code>:</code>, <code>{ }</code>, <code>[ ]</code>, <code>( )</code>, <code>/</code>, <code>\\t</code>, <code>\\n</code>, <code>\\x0B</code>, <code>\\f</code>, <code>\\r</code>, <code>_</code>, and whitespace.</p>",
+          "documentation":"<p>The description of the filter. Valid characters include alphanumeric characters, and special characters such as hyphen, period, colon, underscore, parentheses (<code>{ }</code>, <code>[ ]</code>, and <code>( )</code>), forward slash, horizontal tab, vertical tab, newline, form feed, return, and whitespace.</p>",
           "locationName":"description"
         },
         "Action":{
@@ -2350,6 +2369,18 @@
           "documentation":"<p>The ID of the detector to retrieve information about the delegated administrator from.</p>",
           "location":"uri",
           "locationName":"detectorId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>You can use this parameter to indicate the maximum number of items that you want in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the list action. For subsequent calls to the action, fill <code>nextToken</code> in the request with the value of <code>NextToken</code> from the previous response to continue listing data.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         }
       }
     },
@@ -2373,7 +2404,19 @@
         "DataSources":{
           "shape":"OrganizationDataSourceConfigurationsResult",
           "documentation":"<p>Describes which data sources are enabled automatically for member accounts.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"OrganizationFeaturesConfigurationsResults",
+          "documentation":"<p>A list of features that are configured for this organization.</p>",
+          "locationName":"features"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The pagination parameter to be used on the next list operation to retrieve more items.</p>",
+          "locationName":"nextToken"
         }
       }
     },
@@ -2487,6 +2530,72 @@
       "type":"list",
       "member":{"shape":"Destination"}
     },
+    "DetectorFeature":{
+      "type":"string",
+      "enum":[
+        "S3_DATA_EVENTS",
+        "EKS_AUDIT_LOGS",
+        "EBS_MALWARE_PROTECTION",
+        "RDS_LOGIN_EVENTS"
+      ]
+    },
+    "DetectorFeatureConfiguration":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"DetectorFeature",
+          "documentation":"<p>The name of the feature.</p>",
+          "locationName":"name"
+        },
+        "Status":{
+          "shape":"FeatureStatus",
+          "documentation":"<p>The status of the feature.</p>",
+          "locationName":"status"
+        }
+      },
+      "documentation":"<p>Contains information about a GuardDuty feature.</p>"
+    },
+    "DetectorFeatureConfigurationResult":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"DetectorFeatureResult",
+          "documentation":"<p>Indicates the name of the feature that can be enabled for the detector.</p>",
+          "locationName":"name"
+        },
+        "Status":{
+          "shape":"FeatureStatus",
+          "documentation":"<p>Indicates the status of the feature that is enabled for the detector.</p>",
+          "locationName":"status"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp at which the feature object was updated.</p>",
+          "locationName":"updatedAt"
+        }
+      },
+      "documentation":"<p>Contains information about a GuardDuty feature.</p>"
+    },
+    "DetectorFeatureConfigurations":{
+      "type":"list",
+      "member":{"shape":"DetectorFeatureConfiguration"}
+    },
+    "DetectorFeatureConfigurationsResults":{
+      "type":"list",
+      "member":{"shape":"DetectorFeatureConfigurationResult"}
+    },
+    "DetectorFeatureResult":{
+      "type":"string",
+      "enum":[
+        "FLOW_LOGS",
+        "CLOUD_TRAIL",
+        "DNS_LOGS",
+        "S3_DATA_EVENTS",
+        "EKS_AUDIT_LOGS",
+        "EBS_MALWARE_PROTECTION",
+        "RDS_LOGIN_EVENTS"
+      ]
+    },
     "DetectorId":{
       "type":"string",
       "max":300,
@@ -2878,6 +2987,13 @@
       },
       "documentation":"<p>Contains information about the reason that the finding was generated.</p>"
     },
+    "FeatureStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "Feedback":{
       "type":"string",
       "enum":[
@@ -3144,6 +3260,38 @@
       },
       "documentation":"<p>Contains information on the status of VPC flow logs as a data source.</p>"
     },
+    "FreeTrialFeatureConfigurationResult":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"FreeTrialFeatureResult",
+          "documentation":"<p>The name of the feature for which the free trial is configured.</p>",
+          "locationName":"name"
+        },
+        "FreeTrialDaysRemaining":{
+          "shape":"Integer",
+          "documentation":"<p>The number of the remaining free trial days for the feature.</p>",
+          "locationName":"freeTrialDaysRemaining"
+        }
+      },
+      "documentation":"<p>Contains information about the free trial period for a feature.</p>"
+    },
+    "FreeTrialFeatureConfigurationsResults":{
+      "type":"list",
+      "member":{"shape":"FreeTrialFeatureConfigurationResult"}
+    },
+    "FreeTrialFeatureResult":{
+      "type":"string",
+      "enum":[
+        "FLOW_LOGS",
+        "CLOUD_TRAIL",
+        "DNS_LOGS",
+        "S3_DATA_EVENTS",
+        "EKS_AUDIT_LOGS",
+        "EBS_MALWARE_PROTECTION",
+        "RDS_LOGIN_EVENTS"
+      ]
+    },
     "GeoLocation":{
       "type":"structure",
       "members":{
@@ -3230,12 +3378,19 @@
         "DataSources":{
           "shape":"DataSourceConfigurationsResult",
           "documentation":"<p>Describes which data sources are enabled for the detector.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
         },
         "Tags":{
           "shape":"TagMap",
           "documentation":"<p>The tags of the detector resource.</p>",
           "locationName":"tags"
+        },
+        "Features":{
+          "shape":"DetectorFeatureConfigurationsResults",
+          "documentation":"<p>Describes the features that have been enabled for the detector.</p>",
+          "locationName":"features"
         }
       }
     },
@@ -4567,6 +4722,36 @@
       "max":300,
       "min":1
     },
+    "LoginAttribute":{
+      "type":"structure",
+      "members":{
+        "User":{
+          "shape":"String",
+          "documentation":"<p>Indicates the user name which attempted to log in.</p>",
+          "locationName":"user"
+        },
+        "Application":{
+          "shape":"String",
+          "documentation":"<p>Indicates the application name used to attempt log in.</p>",
+          "locationName":"application"
+        },
+        "FailedLoginAttempts":{
+          "shape":"Integer",
+          "documentation":"<p>Represents the sum of failed (unsuccessful) login attempts made to establish a connection to the database instance.</p>",
+          "locationName":"failedLoginAttempts"
+        },
+        "SuccessfulLoginAttempts":{
+          "shape":"Integer",
+          "documentation":"<p>Represents the sum of successful connections (a correct combination of login attributes) made to the database instance by the actor.</p>",
+          "locationName":"successfulLoginAttempts"
+        }
+      },
+      "documentation":"<p>Information about the login attempts.</p>"
+    },
+    "LoginAttributes":{
+      "type":"list",
+      "member":{"shape":"LoginAttribute"}
+    },
     "Long":{"type":"long"},
     "LongValue":{"type":"long"},
     "MalwareProtectionConfiguration":{
@@ -4697,10 +4882,7 @@
     },
     "MemberDataSourceConfiguration":{
       "type":"structure",
-      "required":[
-        "AccountId",
-        "DataSources"
-      ],
+      "required":["AccountId"],
       "members":{
         "AccountId":{
           "shape":"AccountId",
@@ -4710,7 +4892,14 @@
         "DataSources":{
           "shape":"DataSourceConfigurationsResult",
           "documentation":"<p>Contains information on the status of data sources for the account.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"MemberFeaturesConfigurationsResults",
+          "documentation":"<p>Contains information about the status of the features for the member account.</p>",
+          "locationName":"features"
         }
       },
       "documentation":"<p>Contains information on which data sources are enabled for a member account.</p>"
@@ -4721,6 +4910,51 @@
       "max":50,
       "min":1
     },
+    "MemberFeaturesConfiguration":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"OrgFeature",
+          "documentation":"<p>The name of the feature.</p>",
+          "locationName":"name"
+        },
+        "Status":{
+          "shape":"FeatureStatus",
+          "documentation":"<p>The status of the feature.</p>",
+          "locationName":"status"
+        }
+      },
+      "documentation":"<p>Contains information about the features for the member account.</p>"
+    },
+    "MemberFeaturesConfigurationResult":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"OrgFeature",
+          "documentation":"<p>Indicates the name of the feature that is enabled for the detector.</p>",
+          "locationName":"name"
+        },
+        "Status":{
+          "shape":"FeatureStatus",
+          "documentation":"<p>Indicates the status of the feature that is enabled for the detector.</p>",
+          "locationName":"status"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp at which the feature object was updated.</p>",
+          "locationName":"updatedAt"
+        }
+      },
+      "documentation":"<p>Contains information about the features for the member account.</p>"
+    },
+    "MemberFeaturesConfigurations":{
+      "type":"list",
+      "member":{"shape":"MemberFeaturesConfiguration"}
+    },
+    "MemberFeaturesConfigurationsResults":{
+      "type":"list",
+      "member":{"shape":"MemberFeaturesConfigurationResult"}
+    },
     "Members":{
       "type":"list",
       "member":{"shape":"Member"},
@@ -4853,6 +5087,22 @@
         "DESC"
       ]
     },
+    "OrgFeature":{
+      "type":"string",
+      "enum":[
+        "S3_DATA_EVENTS",
+        "EKS_AUDIT_LOGS",
+        "EBS_MALWARE_PROTECTION",
+        "RDS_LOGIN_EVENTS"
+      ]
+    },
+    "OrgFeatureStatus":{
+      "type":"string",
+      "enum":[
+        "NEW",
+        "NONE"
+      ]
+    },
     "Organization":{
       "type":"structure",
       "members":{
@@ -4944,6 +5194,46 @@
       },
       "documentation":"<p>An object that contains information on the status of whether EBS volumes scanning will be enabled as a data source for an organization.</p>"
     },
+    "OrganizationFeatureConfiguration":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"OrgFeature",
+          "documentation":"<p>The name of the feature that will be configured for the organization.</p>",
+          "locationName":"name"
+        },
+        "AutoEnable":{
+          "shape":"OrgFeatureStatus",
+          "documentation":"<p>The status of the feature that will be configured for the organization.</p>",
+          "locationName":"autoEnable"
+        }
+      },
+      "documentation":"<p>A list of features which will be configured for the organization.</p>"
+    },
+    "OrganizationFeatureConfigurationResult":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"OrgFeature",
+          "documentation":"<p>The name of the feature that is configured for the member accounts within the organization.</p>",
+          "locationName":"name"
+        },
+        "AutoEnable":{
+          "shape":"OrgFeatureStatus",
+          "documentation":"<p>Describes how The status of the feature that are configured for the member accounts within the organization.</p> <p>If you set <code>AutoEnable</code> to <code>NEW</code>, a feature will be configured for only the new accounts when they join the organization.</p> <p>If you set <code>AutoEnable</code> to <code>NONE</code>, no feature will be configured for the accounts when they join the organization.</p>",
+          "locationName":"autoEnable"
+        }
+      },
+      "documentation":"<p>A list of features which will be configured for the organization.</p>"
+    },
+    "OrganizationFeaturesConfigurations":{
+      "type":"list",
+      "member":{"shape":"OrganizationFeatureConfiguration"}
+    },
+    "OrganizationFeaturesConfigurationsResults":{
+      "type":"list",
+      "member":{"shape":"OrganizationFeatureConfigurationResult"}
+    },
     "OrganizationKubernetesAuditLogsConfiguration":{
       "type":"structure",
       "required":["AutoEnable"],
@@ -5199,6 +5489,87 @@
       "max":300,
       "min":1
     },
+    "RdsDbInstanceDetails":{
+      "type":"structure",
+      "members":{
+        "DbInstanceIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier associated to the database instance that was involved in the finding.</p>",
+          "locationName":"dbInstanceIdentifier"
+        },
+        "Engine":{
+          "shape":"String",
+          "documentation":"<p>The database engine of the database instance involved in the finding.</p>",
+          "locationName":"engine"
+        },
+        "EngineVersion":{
+          "shape":"String",
+          "documentation":"<p>The version of the database engine that was involved in the finding.</p>",
+          "locationName":"engineVersion"
+        },
+        "DbClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the database cluster that contains the database instance ID involved in the finding.</p>",
+          "locationName":"dbClusterIdentifier"
+        },
+        "DbInstanceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the database instance involved in the finding.</p>",
+          "locationName":"dbInstanceArn"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>Instance tag key-value pairs associated with the database instance ID.</p>",
+          "locationName":"tags"
+        }
+      },
+      "documentation":"<p>Contains information about the resource type <code>RDSDBInstance</code> involved in a GuardDuty finding.</p>"
+    },
+    "RdsDbUserDetails":{
+      "type":"structure",
+      "members":{
+        "User":{
+          "shape":"String",
+          "documentation":"<p>The user name used in the anomalous login attempt.</p>",
+          "locationName":"user"
+        },
+        "Application":{
+          "shape":"String",
+          "documentation":"<p>The application name used in the anomalous login attempt.</p>",
+          "locationName":"application"
+        },
+        "Database":{
+          "shape":"String",
+          "documentation":"<p>The name of the database instance involved in the anomalous login attempt.</p>",
+          "locationName":"database"
+        },
+        "Ssl":{
+          "shape":"String",
+          "documentation":"<p>The version of the Secure Socket Layer (SSL) used for the network.</p>",
+          "locationName":"ssl"
+        },
+        "AuthMethod":{
+          "shape":"String",
+          "documentation":"<p>The authentication method used by the user involved in the finding.</p>",
+          "locationName":"authMethod"
+        }
+      },
+      "documentation":"<p>Contains information about the user and authentication details for a database instance involved in the finding.</p>"
+    },
+    "RdsLoginAttemptAction":{
+      "type":"structure",
+      "members":{
+        "RemoteIpDetails":{
+          "shape":"RemoteIpDetails",
+          "locationName":"remoteIpDetails"
+        },
+        "LoginAttributes":{
+          "shape":"LoginAttributes",
+          "documentation":"<p>Indicates the login attributes used in the login attempt.</p>"
+        }
+      },
+      "documentation":"<p>Indicates that a login attempt was made to the potentially compromised database from a remote IP address.</p>"
+    },
     "RemoteAccountDetails":{
       "type":"structure",
       "members":{
@@ -5308,6 +5679,16 @@
         "ContainerDetails":{
           "shape":"Container",
           "locationName":"containerDetails"
+        },
+        "RdsDbInstanceDetails":{
+          "shape":"RdsDbInstanceDetails",
+          "documentation":"<p>Contains information about the database instance to which an anomalous login attempt was made.</p>",
+          "locationName":"rdsDbInstanceDetails"
+        },
+        "RdsDbUserDetails":{
+          "shape":"RdsDbUserDetails",
+          "documentation":"<p>Contains information about the user details through which anomalous login attempt was made.</p>",
+          "locationName":"rdsDbUserDetails"
         }
       },
       "documentation":"<p>Contains information about the Amazon Web Services resource associated with the activity that prompted GuardDuty to generate a finding.</p>"
@@ -6198,7 +6579,14 @@
         "DataSources":{
           "shape":"DataSourceConfigurations",
           "documentation":"<p>Describes which data sources will be updated.</p> <p>There might be regional differences because some data sources might not be available in all the Amazon Web Services Regions where GuardDuty is presently supported. For more information, see <a href=\"https://docs.aws.amazon.com/guardduty/latest/ug/guardduty_regions.html\">Regions and endpoints</a>.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"DetectorFeatureConfigurations",
+          "documentation":"<p>Provides the features that will be updated for the detector.</p>",
+          "locationName":"features"
         }
       }
     },
@@ -6384,7 +6772,14 @@
         "DataSources":{
           "shape":"DataSourceConfigurations",
           "documentation":"<p>Describes which data sources will be updated.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"MemberFeaturesConfigurations",
+          "documentation":"<p>A list of features that will be updated for the specified member accounts.</p>",
+          "locationName":"features"
         }
       }
     },
@@ -6420,7 +6815,14 @@
         "DataSources":{
           "shape":"OrganizationDataSourceConfigurations",
           "documentation":"<p>Describes which data sources will be updated.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
+        },
+        "Features":{
+          "shape":"OrganizationFeaturesConfigurations",
+          "documentation":"<p>A list of features that will be configured for the organization.</p>",
+          "locationName":"features"
         }
       }
     },
@@ -6523,7 +6925,6 @@
     },
     "UsageCriteria":{
       "type":"structure",
-      "required":["DataSources"],
       "members":{
         "AccountIds":{
           "shape":"AccountIds",
@@ -6533,12 +6934,19 @@
         "DataSources":{
           "shape":"DataSourceList",
           "documentation":"<p>The data sources to aggregate usage statistics from.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This parameter is deprecated, use Features instead",
           "locationName":"dataSources"
         },
         "Resources":{
           "shape":"ResourceList",
           "documentation":"<p>The resources to aggregate usage statistics from. Only accepts exact resource names.</p>",
           "locationName":"resources"
+        },
+        "Features":{
+          "shape":"UsageFeatureList",
+          "documentation":"<p>The features to aggregate usage statistics from.</p>",
+          "locationName":"features"
         }
       },
       "documentation":"<p>Contains information about the criteria used to query usage statistics.</p>"
@@ -6563,6 +6971,43 @@
       "type":"list",
       "member":{"shape":"UsageDataSourceResult"}
     },
+    "UsageFeature":{
+      "type":"string",
+      "enum":[
+        "FLOW_LOGS",
+        "CLOUD_TRAIL",
+        "DNS_LOGS",
+        "S3_DATA_EVENTS",
+        "EKS_AUDIT_LOGS",
+        "EBS_MALWARE_PROTECTION",
+        "RDS_LOGIN_EVENTS",
+        "LAMBDA_NETWORK_LOGS",
+        "EKS_RUNTIME_MONITORING"
+      ]
+    },
+    "UsageFeatureList":{
+      "type":"list",
+      "member":{"shape":"UsageFeature"}
+    },
+    "UsageFeatureResult":{
+      "type":"structure",
+      "members":{
+        "Feature":{
+          "shape":"UsageFeature",
+          "documentation":"<p>The feature that generated the usage cost.</p>",
+          "locationName":"feature"
+        },
+        "Total":{
+          "shape":"Total",
+          "locationName":"total"
+        }
+      },
+      "documentation":"<p>Contains information about the result of the total usage based on the feature.</p>"
+    },
+    "UsageFeatureResultList":{
+      "type":"list",
+      "member":{"shape":"UsageFeatureResult"}
+    },
     "UsageResourceResult":{
       "type":"structure",
       "members":{
@@ -6589,7 +7034,8 @@
         "SUM_BY_ACCOUNT",
         "SUM_BY_DATA_SOURCE",
         "SUM_BY_RESOURCE",
-        "TOP_RESOURCES"
+        "TOP_RESOURCES",
+        "SUM_BY_FEATURES"
       ]
     },
     "UsageStatistics":{
@@ -6614,6 +7060,11 @@
           "shape":"UsageResourceResultList",
           "documentation":"<p>Lists the top 50 resources that have generated the most GuardDuty usage, in order from most to least expensive.</p>",
           "locationName":"topResources"
+        },
+        "SumByFeature":{
+          "shape":"UsageFeatureResultList",
+          "documentation":"<p>The usage statistic sum organized by feature.</p>",
+          "locationName":"sumByFeature"
         }
       },
       "documentation":"<p>Contains the result of GuardDuty usage. If a UsageStatisticType is provided the result for other types will be null. </p>"
diff --git a/botocore/data/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json b/botocore/data/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json
index c1e99000fa..62dff1a5cb 100644
--- a/botocore/data/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json
+++ b/botocore/data/resource-explorer-2/2022-07-28/endpoint-rule-set-1.json
@@ -3,7 +3,7 @@
     "parameters": {
         "Region": {
             "builtIn": "AWS::Region",
-            "required": true,
+            "required": false,
             "documentation": "The AWS region used to dispatch the request.",
             "type": "String"
         },
@@ -25,13 +25,12 @@
         {
             "conditions": [
                 {
-                    "fn": "aws.partition",
+                    "fn": "isSet",
                     "argv": [
                         {
-                            "ref": "Region"
+                            "ref": "Endpoint"
                         }
-                    ],
-                    "assign": "PartitionResult"
+                    ]
                 }
             ],
             "type": "tree",
@@ -39,80 +38,64 @@
                 {
                     "conditions": [
                         {
-                            "fn": "isSet",
+                            "fn": "booleanEquals",
                             "argv": [
                                 {
-                                    "ref": "Endpoint"
-                                }
+                                    "ref": "UseFIPS"
+                                },
+                                true
                             ]
                         }
                     ],
-                    "type": "tree",
-                    "rules": [
+                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
+                    "type": "error"
+                },
+                {
+                    "conditions": [],
+                    "endpoint": {
+                        "url": {
+                            "ref": "Endpoint"
+                        },
+                        "properties": {},
+                        "headers": {}
+                    },
+                    "type": "endpoint"
+                }
+            ]
+        },
+        {
+            "conditions": [],
+            "type": "tree",
+            "rules": [
+                {
+                    "conditions": [
                         {
-                            "conditions": [
+                            "fn": "isSet",
+                            "argv": [
                                 {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        {
-                                            "ref": "UseFIPS"
-                                        },
-                                        true
-                                    ]
+                                    "ref": "Region"
                                 }
-                            ],
-                            "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
-                            "type": "error"
-                        },
-                        {
-                            "conditions": [],
-                            "endpoint": {
-                                "url": {
-                                    "ref": "Endpoint"
-                                },
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
+                            ]
                         }
-                    ]
-                },
-                {
-                    "conditions": [],
+                    ],
                     "type": "tree",
                     "rules": [
                         {
                             "conditions": [
                                 {
-                                    "fn": "booleanEquals",
+                                    "fn": "aws.partition",
                                     "argv": [
-                                        true,
                                         {
-                                            "fn": "getAttr",
-                                            "argv": [
-                                                {
-                                                    "ref": "PartitionResult"
-                                                },
-                                                "supportsDualStack"
-                                            ]
+                                            "ref": "Region"
                                         }
-                                    ]
+                                    ],
+                                    "assign": "PartitionResult"
                                 }
                             ],
                             "type": "tree",
                             "rules": [
                                 {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseFIPS"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
+                                    "conditions": [],
                                     "type": "tree",
                                     "rules": [
                                         {
@@ -127,7 +110,7 @@
                                                                 {
                                                                     "ref": "PartitionResult"
                                                                 },
-                                                                "supportsFIPS"
+                                                                "supportsDualStack"
                                                             ]
                                                         }
                                                     ]
@@ -135,10 +118,62 @@
                                             ],
                                             "type": "tree",
                                             "rules": [
+                                                {
+                                                    "conditions": [
+                                                        {
+                                                            "fn": "booleanEquals",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "UseFIPS"
+                                                                },
+                                                                true
+                                                            ]
+                                                        }
+                                                    ],
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [
+                                                                {
+                                                                    "fn": "booleanEquals",
+                                                                    "argv": [
+                                                                        true,
+                                                                        {
+                                                                            "fn": "getAttr",
+                                                                            "argv": [
+                                                                                {
+                                                                                    "ref": "PartitionResult"
+                                                                                },
+                                                                                "supportsFIPS"
+                                                                            ]
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ],
+                                                            "type": "tree",
+                                                            "rules": [
+                                                                {
+                                                                    "conditions": [],
+                                                                    "endpoint": {
+                                                                        "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                                        "properties": {},
+                                                                        "headers": {}
+                                                                    },
+                                                                    "type": "endpoint"
+                                                                }
+                                                            ]
+                                                        },
+                                                        {
+                                                            "conditions": [],
+                                                            "error": "FIPS is enabled but this partition does not support FIPS",
+                                                            "type": "error"
+                                                        }
+                                                    ]
+                                                },
                                                 {
                                                     "conditions": [],
                                                     "endpoint": {
-                                                        "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                        "url": "https://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}",
                                                         "properties": {},
                                                         "headers": {}
                                                     },
@@ -148,90 +183,93 @@
                                         },
                                         {
                                             "conditions": [],
-                                            "error": "FIPS is enabled but this partition does not support FIPS",
-                                            "type": "error"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "conditions": [],
-                                    "endpoint": {
-                                        "url": "https://resource-explorer-2.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                        "properties": {},
-                                        "headers": {}
-                                    },
-                                    "type": "endpoint"
-                                }
-                            ]
-                        },
-                        {
-                            "conditions": [],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseFIPS"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
+                                            "type": "tree",
+                                            "rules": [
                                                 {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
+                                                    "conditions": [
                                                         {
-                                                            "fn": "getAttr",
+                                                            "fn": "booleanEquals",
                                                             "argv": [
                                                                 {
-                                                                    "ref": "PartitionResult"
+                                                                    "ref": "UseFIPS"
                                                                 },
-                                                                "supportsFIPS"
+                                                                true
+                                                            ]
+                                                        }
+                                                    ],
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [
+                                                                {
+                                                                    "fn": "booleanEquals",
+                                                                    "argv": [
+                                                                        true,
+                                                                        {
+                                                                            "fn": "getAttr",
+                                                                            "argv": [
+                                                                                {
+                                                                                    "ref": "PartitionResult"
+                                                                                },
+                                                                                "supportsFIPS"
+                                                                            ]
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ],
+                                                            "type": "tree",
+                                                            "rules": [
+                                                                {
+                                                                    "conditions": [],
+                                                                    "type": "tree",
+                                                                    "rules": [
+                                                                        {
+                                                                            "conditions": [],
+                                                                            "endpoint": {
+                                                                                "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dnsSuffix}",
+                                                                                "properties": {},
+                                                                                "headers": {}
+                                                                            },
+                                                                            "type": "endpoint"
+                                                                        }
+                                                                    ]
+                                                                }
                                                             ]
+                                                        },
+                                                        {
+                                                            "conditions": [],
+                                                            "error": "FIPS is enabled but this partition does not support FIPS",
+                                                            "type": "error"
                                                         }
                                                     ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
+                                                },
                                                 {
                                                     "conditions": [],
-                                                    "endpoint": {
-                                                        "url": "https://resource-explorer-2-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                        "properties": {},
-                                                        "headers": {}
-                                                    },
-                                                    "type": "endpoint"
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [],
+                                                            "endpoint": {
+                                                                "url": "https://resource-explorer-2.{Region}.{PartitionResult#dnsSuffix}",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        }
+                                                    ]
                                                 }
                                             ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS is enabled but this partition does not support FIPS",
-                                            "type": "error"
                                         }
                                     ]
-                                },
-                                {
-                                    "conditions": [],
-                                    "endpoint": {
-                                        "url": "https://resource-explorer-2.{Region}.{PartitionResult#dnsSuffix}",
-                                        "properties": {},
-                                        "headers": {}
-                                    },
-                                    "type": "endpoint"
                                 }
                             ]
                         }
                     ]
+                },
+                {
+                    "conditions": [],
+                    "error": "Invalid Configuration: Missing Region",
+                    "type": "error"
                 }
             ]
         }
diff --git a/botocore/data/resource-explorer-2/2022-07-28/service-2.json b/botocore/data/resource-explorer-2/2022-07-28/service-2.json
index 52001af261..859b1a6017 100644
--- a/botocore/data/resource-explorer-2/2022-07-28/service-2.json
+++ b/botocore/data/resource-explorer-2/2022-07-28/service-2.json
@@ -461,7 +461,7 @@
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>You tried to create a new view or index when one already exists, and you either didn't specify or specified a different idempotency token as the original request.</p>",
+      "documentation":"<p>The request failed because either you specified parameters that didn’t match the original request, or you attempted to create a view with a name that already exists in this Amazon Web Services Region.</p>",
       "error":{
         "httpStatusCode":409,
         "senderFault":true
diff --git a/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json b/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json
index c7feffe0bc..1df2646e75 100644
--- a/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json
+++ b/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json
@@ -3,7 +3,7 @@
     "parameters": {
         "Region": {
             "builtIn": "AWS::Region",
-            "required": true,
+            "required": false,
             "documentation": "The AWS region used to dispatch the request.",
             "type": "String"
         },
@@ -32,13 +32,12 @@
         {
             "conditions": [
                 {
-                    "fn": "aws.partition",
+                    "fn": "isSet",
                     "argv": [
                         {
-                            "ref": "Region"
+                            "ref": "Endpoint"
                         }
-                    ],
-                    "assign": "PartitionResult"
+                    ]
                 }
             ],
             "type": "tree",
@@ -46,14 +45,20 @@
                 {
                     "conditions": [
                         {
-                            "fn": "isSet",
+                            "fn": "booleanEquals",
                             "argv": [
                                 {
-                                    "ref": "Endpoint"
-                                }
+                                    "ref": "UseFIPS"
+                                },
+                                true
                             ]
                         }
                     ],
+                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
+                    "type": "error"
+                },
+                {
+                    "conditions": [],
                     "type": "tree",
                     "rules": [
                         {
@@ -62,67 +67,42 @@
                                     "fn": "booleanEquals",
                                     "argv": [
                                         {
-                                            "ref": "UseFIPS"
+                                            "ref": "UseDualStack"
                                         },
                                         true
                                     ]
                                 }
                             ],
-                            "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
+                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
                             "type": "error"
                         },
                         {
                             "conditions": [],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseDualStack"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
-                                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
-                                    "type": "error"
+                            "endpoint": {
+                                "url": {
+                                    "ref": "Endpoint"
                                 },
-                                {
-                                    "conditions": [],
-                                    "endpoint": {
-                                        "url": {
-                                            "ref": "Endpoint"
-                                        },
-                                        "properties": {},
-                                        "headers": {}
-                                    },
-                                    "type": "endpoint"
-                                }
-                            ]
+                                "properties": {},
+                                "headers": {}
+                            },
+                            "type": "endpoint"
                         }
                     ]
-                },
+                }
+            ]
+        },
+        {
+            "conditions": [],
+            "type": "tree",
+            "rules": [
                 {
                     "conditions": [
                         {
-                            "fn": "booleanEquals",
-                            "argv": [
-                                {
-                                    "ref": "UseFIPS"
-                                },
-                                true
-                            ]
-                        },
-                        {
-                            "fn": "booleanEquals",
+                            "fn": "isSet",
                             "argv": [
                                 {
-                                    "ref": "UseDualStack"
-                                },
-                                true
+                                    "ref": "Region"
+                                }
                             ]
                         }
                     ],
@@ -131,224 +111,288 @@
                         {
                             "conditions": [
                                 {
-                                    "fn": "booleanEquals",
+                                    "fn": "aws.partition",
                                     "argv": [
-                                        true,
                                         {
-                                            "fn": "getAttr",
-                                            "argv": [
-                                                {
-                                                    "ref": "PartitionResult"
-                                                },
-                                                "supportsFIPS"
-                                            ]
+                                            "ref": "Region"
                                         }
-                                    ]
-                                },
+                                    ],
+                                    "assign": "PartitionResult"
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
                                 {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        true,
+                                    "conditions": [
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseFIPS"
                                                 },
-                                                "supportsDualStack"
+                                                true
                                             ]
-                                        }
-                                    ]
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [],
-                                    "endpoint": {
-                                        "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                        "properties": {},
-                                        "headers": {}
-                                    },
-                                    "type": "endpoint"
-                                }
-                            ]
-                        },
-                        {
-                            "conditions": [],
-                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
-                            "type": "error"
-                        }
-                    ]
-                },
-                {
-                    "conditions": [
-                        {
-                            "fn": "booleanEquals",
-                            "argv": [
-                                {
-                                    "ref": "UseFIPS"
-                                },
-                                true
-                            ]
-                        }
-                    ],
-                    "type": "tree",
-                    "rules": [
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        true,
+                                        },
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseDualStack"
                                                 },
-                                                "supportsFIPS"
+                                                true
                                             ]
                                         }
-                                    ]
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [],
+                                    ],
                                     "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
-                                                    "fn": "stringEquals",
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsFIPS"
+                                                            ]
+                                                        }
+                                                    ]
+                                                },
+                                                {
+                                                    "fn": "booleanEquals",
                                                     "argv": [
-                                                        "aws",
+                                                        true,
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
                                                                 {
                                                                     "ref": "PartitionResult"
                                                                 },
-                                                                "name"
+                                                                "supportsDualStack"
                                                             ]
                                                         }
                                                     ]
                                                 }
                                             ],
-                                            "endpoint": {
-                                                "url": "https://runtime-fips.sagemaker.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "type": "tree",
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [],
+                                                            "endpoint": {
+                                                                "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        }
+                                                    ]
+                                                }
+                                            ]
                                         },
+                                        {
+                                            "conditions": [],
+                                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
+                                            "type": "error"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "type": "tree",
+                                    "rules": [
                                         {
                                             "conditions": [
                                                 {
-                                                    "fn": "stringEquals",
+                                                    "fn": "booleanEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
+                                                        true,
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
                                                                 {
                                                                     "ref": "PartitionResult"
                                                                 },
-                                                                "name"
+                                                                "supportsFIPS"
                                                             ]
                                                         }
                                                     ]
                                                 }
                                             ],
-                                            "endpoint": {
-                                                "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "type": "tree",
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [
+                                                                {
+                                                                    "fn": "stringEquals",
+                                                                    "argv": [
+                                                                        "aws",
+                                                                        {
+                                                                            "fn": "getAttr",
+                                                                            "argv": [
+                                                                                {
+                                                                                    "ref": "PartitionResult"
+                                                                                },
+                                                                                "name"
+                                                                            ]
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ],
+                                                            "endpoint": {
+                                                                "url": "https://runtime-fips.sagemaker.{Region}.amazonaws.com",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        },
+                                                        {
+                                                            "conditions": [
+                                                                {
+                                                                    "fn": "stringEquals",
+                                                                    "argv": [
+                                                                        "aws-us-gov",
+                                                                        {
+                                                                            "fn": "getAttr",
+                                                                            "argv": [
+                                                                                {
+                                                                                    "ref": "PartitionResult"
+                                                                                },
+                                                                                "name"
+                                                                            ]
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ],
+                                                            "endpoint": {
+                                                                "url": "https://runtime.sagemaker.{Region}.amazonaws.com",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        },
+                                                        {
+                                                            "conditions": [],
+                                                            "endpoint": {
+                                                                "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dnsSuffix}",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        }
+                                                    ]
+                                                }
+                                            ]
                                         },
                                         {
                                             "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "error": "FIPS is enabled but this partition does not support FIPS",
+                                            "type": "error"
                                         }
                                     ]
-                                }
-                            ]
-                        },
-                        {
-                            "conditions": [],
-                            "error": "FIPS is enabled but this partition does not support FIPS",
-                            "type": "error"
-                        }
-                    ]
-                },
-                {
-                    "conditions": [
-                        {
-                            "fn": "booleanEquals",
-                            "argv": [
-                                {
-                                    "ref": "UseDualStack"
                                 },
-                                true
-                            ]
-                        }
-                    ],
-                    "type": "tree",
-                    "rules": [
-                        {
-                            "conditions": [
                                 {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        true,
+                                    "conditions": [
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseDualStack"
                                                 },
-                                                "supportsDualStack"
+                                                true
                                             ]
                                         }
+                                    ],
+                                    "type": "tree",
+                                    "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsDualStack"
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "type": "tree",
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "type": "tree",
+                                                    "rules": [
+                                                        {
+                                                            "conditions": [],
+                                                            "endpoint": {
+                                                                "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                                "properties": {},
+                                                                "headers": {}
+                                                            },
+                                                            "type": "endpoint"
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            "conditions": [],
+                                            "error": "DualStack is enabled but this partition does not support DualStack",
+                                            "type": "error"
+                                        }
                                     ]
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
+                                },
                                 {
                                     "conditions": [],
-                                    "endpoint": {
-                                        "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                        "properties": {},
-                                        "headers": {}
-                                    },
-                                    "type": "endpoint"
+                                    "type": "tree",
+                                    "rules": [
+                                        {
+                                            "conditions": [],
+                                            "endpoint": {
+                                                "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}",
+                                                "properties": {},
+                                                "headers": {}
+                                            },
+                                            "type": "endpoint"
+                                        }
+                                    ]
                                 }
                             ]
-                        },
-                        {
-                            "conditions": [],
-                            "error": "DualStack is enabled but this partition does not support DualStack",
-                            "type": "error"
                         }
                     ]
                 },
                 {
                     "conditions": [],
-                    "endpoint": {
-                        "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}",
-                        "properties": {},
-                        "headers": {}
-                    },
-                    "type": "endpoint"
+                    "error": "Invalid Configuration: Missing Region",
+                    "type": "error"
                 }
             ]
         }
diff --git a/botocore/data/sagemaker-runtime/2017-05-13/service-2.json b/botocore/data/sagemaker-runtime/2017-05-13/service-2.json
index 29212058a2..e1ac5ff360 100644
--- a/botocore/data/sagemaker-runtime/2017-05-13/service-2.json
+++ b/botocore/data/sagemaker-runtime/2017-05-13/service-2.json
@@ -159,13 +159,13 @@
         },
         "RequestTTLSeconds":{
           "shape":"RequestTTLSecondsHeader",
-          "documentation":"<p>Maximum age in seconds a request can be in the queue before it is marked as expired.</p>",
+          "documentation":"<p>Maximum age in seconds a request can be in the queue before it is marked as expired. The default is 6 hours, or 21,600 seconds.</p>",
           "location":"header",
           "locationName":"X-Amzn-SageMaker-RequestTTLSeconds"
         },
         "InvocationTimeoutSeconds":{
           "shape":"InvocationTimeoutSecondsHeader",
-          "documentation":"<p>Maximum amount of time in seconds a request can be processed before it is marked as expired.</p>",
+          "documentation":"<p>Maximum amount of time in seconds a request can be processed before it is marked as expired. The default is 15 minutes, or 900 seconds.</p>",
           "location":"header",
           "locationName":"X-Amzn-SageMaker-InvocationTimeoutSeconds"
         }
diff --git a/botocore/docs/client.py b/botocore/docs/client.py
index 4bd6d9853d..5268ca43fe 100644
--- a/botocore/docs/client.py
+++ b/botocore/docs/client.py
@@ -143,9 +143,16 @@ def _add_client_methods(self, client_methods):
 
     def _add_client_method(self, section, method_name, method):
         section.add_title_section(method_name)
-        method_section = section.add_new_section(method_name)
+        method_section = section.add_new_section(
+            method_name,
+            context={'qualifier': f'{self._client_class_name}.Client.'},
+        )
         if self._is_custom_method(method_name):
-            self._add_custom_method(method_section, method_name, method)
+            self._add_custom_method(
+                method_section,
+                method_name,
+                method,
+            )
         else:
             self._add_model_driven_method(method_section, method_name)
 
@@ -172,9 +179,12 @@ def _add_model_driven_method(self, section, method_name):
         operation_model = service_model.operation_model(operation_name)
 
         example_prefix = 'response = client.%s' % method_name
+        full_method_name = (
+            f"{section.context.get('qualifier', '')}{method_name}"
+        )
         document_model_driven_method(
             section,
-            method_name,
+            full_method_name,
             operation_model,
             event_emitter=self._client.meta.events,
             method_description=operation_model.documentation,
diff --git a/botocore/docs/example.py b/botocore/docs/example.py
index 05f50a3ce0..9f831bcde1 100644
--- a/botocore/docs/example.py
+++ b/botocore/docs/example.py
@@ -46,6 +46,8 @@ def document_example(
             include=include,
             exclude=exclude,
         )
+        final_blank_line_section = section.add_new_section('final-blank-line')
+        final_blank_line_section.style.new_line()
 
     def document_recursive_shape(self, section, shape, **kwargs):
         section.write('{\'... recursive ...\'}')
diff --git a/botocore/docs/method.py b/botocore/docs/method.py
index e9769ebd8d..5db906c8dd 100644
--- a/botocore/docs/method.py
+++ b/botocore/docs/method.py
@@ -127,7 +127,8 @@ def document_custom_method(section, method_name, method):
 
     :param method: The handle to the method being documented
     """
-    document_custom_signature(section, method_name, method)
+    full_method_name = f"{section.context.get('qualifier', '')}{method_name}"
+    document_custom_signature(section, full_method_name, method)
     method_intro_section = section.add_new_section('method-intro')
     method_intro_section.writeln('')
     doc_string = inspect.getdoc(method)
diff --git a/docs/source/_static/js/custom.js b/docs/source/_static/js/custom.js
index 3532f5c2d1..07bb256514 100644
--- a/docs/source/_static/js/custom.js
+++ b/docs/source/_static/js/custom.js
@@ -15,9 +15,10 @@ limitations under the License.
 */
 
 // Checks if an html doc name matches a service class name.
-function isValidServiceName(docName, serviceClassName) {
-	const new_docName = docName.replaceAll('-', '').toLowerCase();
-	return new_docName === serviceClassName;
+function isValidServiceName(serviceClassName) {
+	const pageTitle = document.getElementsByTagName('h1')[0];
+	const newDocName = pageTitle.getElementsByTagName('a')[0].innerHTML;
+	return newDocName.toLowerCase() === serviceClassName;
 }
 // Checks if all elements of the split fragment are valid.
 // Fragment items should only contain alphanumerics, hyphens, & underscores.
@@ -44,7 +45,7 @@ function isValidFragment(splitFragment) {
 		const serviceDocName = currentPath[currentPath.length - 1].replace('.html', '');
 		const splitFragment = fragment.split('.');
 		splitFragment[0] = splitFragment[0].toLowerCase();
-		if (isValidFragment(splitFragment) && isValidServiceName(serviceDocName, splitFragment[0])) {
+		if (isValidFragment(splitFragment) && isValidServiceName(splitFragment[0])) {
 			// Replace class name with doc name
 			splitFragment[0] = serviceDocName;
 			splitFragment[1] = splitFragment[1].toLowerCase();
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f940f817c9..8e3422a069 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.29.'
 # The full version, including alpha/beta/rc tags.
-release = '1.29.92'
+release = '1.29.93'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tests/functional/docs/__init__.py b/tests/functional/docs/__init__.py
index 0c5655c46f..87e0a76691 100644
--- a/tests/functional/docs/__init__.py
+++ b/tests/functional/docs/__init__.py
@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import os
+import re
 import shutil
 import tempfile
 
@@ -76,9 +77,11 @@ def get_title_section_for(self, service_name):
 
     def get_method_document_block(self, operation_name, contents):
         contents = contents.decode('utf-8')
-        start_method_document = '.. py:method:: %s(' % operation_name
-        start_index = contents.find(start_method_document)
-        self.assertNotEqual(start_index, -1, 'Method is not found in contents')
+        regex = rf'.. py:method:: ([a-zA-Z0-9]*\.)*{operation_name}\('
+        match = re.search(regex, contents)
+        self.assertIsNotNone(match, 'Method is not found in contents')
+        start_method_document = match.group()
+        start_index = match.start()
         contents = contents[start_index:]
         end_index = contents.find('.. py:method::', len(start_method_document))
         contents = contents[:end_index]
diff --git a/tests/functional/endpoint-rules/guardduty/endpoint-tests-1.json b/tests/functional/endpoint-rules/guardduty/endpoint-tests-1.json
index 514a059759..0103573bb0 100644
--- a/tests/functional/endpoint-rules/guardduty/endpoint-tests-1.json
+++ b/tests/functional/endpoint-rules/guardduty/endpoint-tests-1.json
@@ -9,8 +9,8 @@
             },
             "params": {
                 "Region": "af-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -22,8 +22,8 @@
             },
             "params": {
                 "Region": "ap-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -35,8 +35,8 @@
             },
             "params": {
                 "Region": "ap-northeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -48,8 +48,8 @@
             },
             "params": {
                 "Region": "ap-northeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -61,8 +61,8 @@
             },
             "params": {
                 "Region": "ap-northeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -74,8 +74,8 @@
             },
             "params": {
                 "Region": "ap-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -87,8 +87,8 @@
             },
             "params": {
                 "Region": "ap-southeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -100,8 +100,8 @@
             },
             "params": {
                 "Region": "ap-southeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -113,8 +113,8 @@
             },
             "params": {
                 "Region": "ap-southeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -126,8 +126,8 @@
             },
             "params": {
                 "Region": "ca-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -139,8 +139,8 @@
             },
             "params": {
                 "Region": "eu-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -152,8 +152,8 @@
             },
             "params": {
                 "Region": "eu-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -165,8 +165,8 @@
             },
             "params": {
                 "Region": "eu-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -178,8 +178,8 @@
             },
             "params": {
                 "Region": "eu-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -191,8 +191,8 @@
             },
             "params": {
                 "Region": "eu-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -204,8 +204,8 @@
             },
             "params": {
                 "Region": "eu-west-3",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -217,8 +217,8 @@
             },
             "params": {
                 "Region": "me-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -230,8 +230,8 @@
             },
             "params": {
                 "Region": "sa-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -243,8 +243,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -256,8 +256,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -269,8 +269,8 @@
             },
             "params": {
                 "Region": "us-east-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -282,8 +282,8 @@
             },
             "params": {
                 "Region": "us-east-2",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -295,8 +295,8 @@
             },
             "params": {
                 "Region": "us-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -308,8 +308,8 @@
             },
             "params": {
                 "Region": "us-west-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -321,8 +321,8 @@
             },
             "params": {
                 "Region": "us-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -334,8 +334,8 @@
             },
             "params": {
                 "Region": "us-west-2",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -347,8 +347,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": true
             }
         },
         {
@@ -360,8 +360,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": false
             }
         },
         {
@@ -373,8 +373,8 @@
             },
             "params": {
                 "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -386,8 +386,8 @@
             },
             "params": {
                 "Region": "cn-northwest-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -399,8 +399,8 @@
             },
             "params": {
                 "Region": "cn-north-1",
-                "UseFIPS": true,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": true
             }
         },
         {
@@ -412,8 +412,8 @@
             },
             "params": {
                 "Region": "cn-north-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -425,8 +425,8 @@
             },
             "params": {
                 "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": false
             }
         },
         {
@@ -438,8 +438,8 @@
             },
             "params": {
                 "Region": "us-gov-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -451,8 +451,8 @@
             },
             "params": {
                 "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -464,8 +464,8 @@
             },
             "params": {
                 "Region": "us-gov-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -477,8 +477,8 @@
             },
             "params": {
                 "Region": "us-gov-west-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -490,8 +490,8 @@
             },
             "params": {
                 "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": true
             }
         },
         {
@@ -503,8 +503,8 @@
             },
             "params": {
                 "Region": "us-gov-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
+                "UseDualStack": true,
+                "UseFIPS": false
             }
         },
         {
@@ -516,8 +516,8 @@
             },
             "params": {
                 "Region": "us-iso-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -529,8 +529,8 @@
             },
             "params": {
                 "Region": "us-iso-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -542,8 +542,8 @@
             },
             "params": {
                 "Region": "us-isob-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": true
             }
         },
         {
@@ -555,8 +555,8 @@
             },
             "params": {
                 "Region": "us-isob-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": false,
+                "UseFIPS": false
             }
         },
         {
@@ -568,8 +568,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": false,
                 "UseDualStack": false,
+                "UseFIPS": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -581,8 +581,8 @@
                 }
             },
             "params": {
-                "UseFIPS": false,
                 "UseDualStack": false,
+                "UseFIPS": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -593,8 +593,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": true,
                 "UseDualStack": false,
+                "UseFIPS": true,
                 "Endpoint": "https://example.com"
             }
         },
@@ -605,8 +605,8 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": false,
                 "UseDualStack": true,
+                "UseFIPS": false,
                 "Endpoint": "https://example.com"
             }
         }
diff --git a/tests/functional/endpoint-rules/resource-explorer-2/endpoint-tests-1.json b/tests/functional/endpoint-rules/resource-explorer-2/endpoint-tests-1.json
index 924c6acee7..7153473aa1 100644
--- a/tests/functional/endpoint-rules/resource-explorer-2/endpoint-tests-1.json
+++ b/tests/functional/endpoint-rules/resource-explorer-2/endpoint-tests-1.json
@@ -1,1565 +1,5 @@
 {
     "testCases": [
-        {
-            "documentation": "For region ap-south-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-south-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-south-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-south-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-south-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-south-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-south-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-central-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-central-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-central-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-central-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-central-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-central-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-central-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-central-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-central-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-central-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-central-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-3",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-3",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-3",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-3",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-south-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-south-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-south-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "me-south-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.sa-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "sa-east-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.sa-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "sa-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.sa-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "sa-east-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.sa-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "sa-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ca-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ca-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-west-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ca-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ca-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-west-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ca-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ca-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-west-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ca-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ca-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ca-west-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-gov-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-gov-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-gov-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-gov-west-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-3.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-4.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-4",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-4.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-4",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-4.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-4",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-4.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-4",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-5 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-5.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-5",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-5 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-5.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-5",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-5 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-5.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-5",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-5 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-5.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-5",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
         {
             "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
@@ -1569,20 +9,6 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseDualStack": false,
                 "UseFIPS": true
             }
         },
@@ -1595,189 +21,78 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-6 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-6.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-6",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-6 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.ap-southeast-6.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-6",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-6 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-6.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-6",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-6 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.ap-southeast-6.api.aws"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-6",
-                "UseDualStack": false,
                 "UseFIPS": false
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-east-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://resource-explorer-2-fips.us-east-2.api.aws"
+                    "url": "https://resource-explorer-2-fips.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-2",
-                "UseDualStack": false,
+                "Region": "cn-north-1",
                 "UseFIPS": true
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2.us-east-2.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseDualStack": true,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://resource-explorer-2.us-east-2.api.aws"
+                    "url": "https://resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-2",
-                "UseDualStack": false,
+                "Region": "cn-north-1",
                 "UseFIPS": false
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://resource-explorer-2-fips.cn-northwest-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-northwest-1",
-                "UseDualStack": true,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://resource-explorer-2-fips.cn-northwest-1.api.amazonwebservices.com.cn"
+                    "url": "https://resource-explorer-2-fips.us-gov-east-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-northwest-1",
-                "UseDualStack": false,
+                "Region": "us-gov-east-1",
                 "UseFIPS": true
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn"
+                    "url": "https://resource-explorer-2.us-gov-east-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-northwest-1",
-                "UseDualStack": true,
+                "Region": "us-gov-east-1",
                 "UseFIPS": false
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn"
+                    "url": "https://example.com"
                 }
             },
             "params": {
-                "Region": "cn-northwest-1",
-                "UseDualStack": false,
-                "UseFIPS": false
+                "Region": "us-east-1",
+                "UseFIPS": false,
+                "Endpoint": "https://example.com"
             }
         },
         {
-            "documentation": "For custom endpoint with fips disabled and dualstack disabled",
+            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
                     "url": "https://example.com"
                 }
             },
             "params": {
-                "Region": "us-east-1",
-                "UseDualStack": false,
                 "UseFIPS": false,
                 "Endpoint": "https://example.com"
             }
@@ -1789,7 +104,6 @@
             },
             "params": {
                 "Region": "us-east-1",
-                "UseDualStack": false,
                 "UseFIPS": true,
                 "Endpoint": "https://example.com"
             }
diff --git a/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json b/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json
index b35573ad7b..e8f9a07a30 100644
--- a/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json
+++ b/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json
@@ -1,1466 +1,523 @@
 {
     "testCases": [
         {
-            "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-south-1"
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-south-1"
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "ap-south-1"
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-south-1"
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-south-1"
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-south-1"
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-south-1"
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-south-1"
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "us-gov-east-1"
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "us-gov-east-1"
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "us-gov-east-1"
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "us-gov-east-1"
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "me-central-1"
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.me-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "me-central-1"
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.me-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "me-central-1"
-            }
-        },
-        {
-            "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.me-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "me-central-1"
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ca-central-1"
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ca-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ca-central-1"
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ca-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "ca-central-1"
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ca-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ca-central-1"
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-central-1"
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-central-1"
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-central-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-central-1"
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-central-1"
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "us-west-1"
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.us-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "us-west-1"
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-west-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "us-west-1"
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "us-west-1"
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "us-west-2"
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "us-west-2"
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-west-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "us-west-2"
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "us-west-2"
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "af-south-1"
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.af-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "af-south-1"
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.af-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "af-south-1"
-            }
-        },
-        {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.af-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "af-south-1"
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-north-1"
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-north-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-north-1"
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-north-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-north-1"
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-north-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-north-1"
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-west-3"
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-west-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-west-3"
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-3.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-west-3"
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-west-3"
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-west-2"
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-west-2"
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-west-2"
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-west-2"
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "eu-west-1"
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.eu-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "eu-west-1"
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "eu-west-1"
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.eu-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "eu-west-1"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-northeast-3"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-northeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-northeast-3"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-3.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "ap-northeast-3"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-northeast-3"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-northeast-2"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-northeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-northeast-2"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-2.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "ap-northeast-2"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-northeast-2"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-northeast-1"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-northeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-northeast-1"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "ap-northeast-1"
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-northeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-northeast-1"
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "me-south-1"
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.me-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "me-south-1"
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.me-south-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "me-south-1"
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker.me-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "me-south-1"
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.sa-east-1.api.aws"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "sa-east-1"
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.sa-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.af-south-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "sa-east-1"
+                "Region": "af-south-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.sa-east-1.api.aws"
+                    "url": "https://runtime.sagemaker.ap-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "ap-east-1",
                 "UseFIPS": false,
-                "Region": "sa-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.sa-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.ap-northeast-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "ap-northeast-1",
                 "UseFIPS": false,
-                "Region": "sa-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-east-1.api.aws"
+                    "url": "https://runtime.sagemaker.ap-northeast-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-east-1"
+                "Region": "ap-northeast-2",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.ap-northeast-3.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-east-1"
+                "Region": "ap-northeast-3",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-east-1.api.aws"
+                    "url": "https://runtime.sagemaker.ap-south-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "ap-south-1",
                 "UseFIPS": false,
-                "Region": "ap-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.ap-southeast-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "ap-southeast-1",
                 "UseFIPS": false,
-                "Region": "ap-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://runtime.sagemaker.ap-southeast-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "cn-north-1"
+                "Region": "ap-southeast-2",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.cn-north-1.amazonaws.com.cn"
+                    "url": "https://runtime.sagemaker.ca-central-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "cn-north-1"
+                "Region": "ca-central-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://runtime.sagemaker.eu-central-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "eu-central-1",
                 "UseFIPS": false,
-                "Region": "cn-north-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.cn-north-1.amazonaws.com.cn"
+                    "url": "https://runtime.sagemaker.eu-north-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "eu-north-1",
                 "UseFIPS": false,
-                "Region": "cn-north-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-gov-west-1.api.aws"
+                    "url": "https://runtime.sagemaker.eu-south-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "us-gov-west-1"
+                "Region": "eu-south-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.eu-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "us-gov-west-1"
+                "Region": "eu-west-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-west-1.api.aws"
+                    "url": "https://runtime.sagemaker.eu-west-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "eu-west-2",
                 "UseFIPS": false,
-                "Region": "us-gov-west-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.eu-west-3.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "eu-west-3",
                 "UseFIPS": false,
-                "Region": "us-gov-west-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-southeast-1.api.aws"
+                    "url": "https://runtime.sagemaker.me-south-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-southeast-1"
+                "Region": "me-south-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-southeast-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.sa-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-southeast-1"
+                "Region": "sa-east-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-1.api.aws"
+                    "url": "https://runtime.sagemaker.us-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-east-1",
                 "UseFIPS": false,
-                "Region": "ap-southeast-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-1.amazonaws.com"
+                    "url": "https://runtime-fips.sagemaker.us-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-southeast-1"
+                "Region": "us-east-1",
+                "UseFIPS": true,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-southeast-2.api.aws"
+                    "url": "https://runtime.sagemaker.us-east-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "ap-southeast-2"
+                "Region": "us-east-2",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-southeast-2.amazonaws.com"
+                    "url": "https://runtime-fips.sagemaker.us-east-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-east-2",
                 "UseFIPS": true,
-                "Region": "ap-southeast-2"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-2.api.aws"
+                    "url": "https://runtime.sagemaker.us-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-west-1",
                 "UseFIPS": false,
-                "Region": "ap-southeast-2"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-2.amazonaws.com"
+                    "url": "https://runtime-fips.sagemaker.us-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "ap-southeast-2"
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
-            },
-            "params": {
-                "UseDualStack": true,
+                "Region": "us-west-1",
                 "UseFIPS": true,
-                "Region": "us-iso-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://runtime.sagemaker.us-west-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "us-iso-east-1"
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
-            },
-            "params": {
-                "UseDualStack": true,
+                "Region": "us-west-2",
                 "UseFIPS": false,
-                "Region": "us-iso-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://runtime-fips.sagemaker.us-west-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "us-iso-east-1"
+                "Region": "us-west-2",
+                "UseFIPS": true,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.ap-southeast-3.api.aws"
+                    "url": "https://runtime.sagemaker-fips.us-east-1.api.aws"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-east-1",
                 "UseFIPS": true,
-                "Region": "ap-southeast-3"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.ap-southeast-3.amazonaws.com"
+                    "url": "https://runtime.sagemaker.us-east-1.api.aws"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "ap-southeast-3"
+                "Region": "us-east-1",
+                "UseFIPS": false,
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled",
+            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-3.api.aws"
+                    "url": "https://runtime.sagemaker.cn-north-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "cn-north-1",
                 "UseFIPS": false,
-                "Region": "ap-southeast-3"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.ap-southeast-3.amazonaws.com"
+                    "url": "https://runtime.sagemaker.cn-northwest-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "cn-northwest-1",
                 "UseFIPS": false,
-                "Region": "ap-southeast-3"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-east-1.api.aws"
+                    "url": "https://runtime.sagemaker-fips.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "cn-north-1",
                 "UseFIPS": true,
-                "Region": "us-east-1"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.us-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker-fips.cn-north-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "cn-north-1",
                 "UseFIPS": true,
-                "Region": "us-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-east-1.api.aws"
+                    "url": "https://runtime.sagemaker.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "cn-north-1",
                 "UseFIPS": false,
-                "Region": "us-east-1"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-east-1.amazonaws.com"
+                    "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-gov-west-1",
                 "UseFIPS": false,
-                "Region": "us-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.us-east-2.api.aws"
+                    "url": "https://runtime.sagemaker.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-gov-west-1",
                 "UseFIPS": true,
-                "Region": "us-east-2"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime-fips.sagemaker.us-east-2.amazonaws.com"
+                    "url": "https://runtime.sagemaker-fips.us-gov-east-1.api.aws"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-gov-east-1",
                 "UseFIPS": true,
-                "Region": "us-east-2"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-east-2.api.aws"
+                    "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
-                "Region": "us-east-2"
+                "Region": "us-gov-east-1",
+                "UseFIPS": true,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-east-2.amazonaws.com"
+                    "url": "https://runtime.sagemaker.us-gov-east-1.api.aws"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-gov-east-1",
                 "UseFIPS": false,
-                "Region": "us-east-2"
-            }
-        },
-        {
-            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.cn-northwest-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "UseDualStack": true,
-                "UseFIPS": true,
-                "Region": "cn-northwest-1"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker-fips.cn-northwest-1.amazonaws.com.cn"
+                    "url": "https://runtime.sagemaker.us-gov-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
-                "Region": "cn-northwest-1"
+                "Region": "us-gov-east-1",
+                "UseFIPS": false,
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.cn-northwest-1.api.amazonwebservices.com.cn"
+                    "url": "https://runtime.sagemaker.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-iso-east-1",
                 "UseFIPS": false,
-                "Region": "cn-northwest-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.cn-northwest-1.amazonaws.com.cn"
+                    "url": "https://runtime.sagemaker-fips.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": false,
-                "Region": "cn-northwest-1"
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
-            },
-            "params": {
-                "UseDualStack": true,
+                "Region": "us-iso-east-1",
                 "UseFIPS": true,
-                "Region": "us-isob-east-1"
+                "UseDualStack": false
             }
         },
         {
@@ -1471,46 +528,48 @@
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-isob-east-1",
                 "UseFIPS": true,
-                "Region": "us-isob-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
+                "endpoint": {
+                    "url": "https://runtime.sagemaker.us-isob-east-1.sc2s.sgov.gov"
+                }
             },
             "params": {
-                "UseDualStack": true,
+                "Region": "us-isob-east-1",
                 "UseFIPS": false,
-                "Region": "us-isob-east-1"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://runtime.sagemaker.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://example.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
+                "Region": "us-east-1",
                 "UseFIPS": false,
-                "Region": "us-isob-east-1"
+                "UseDualStack": false,
+                "Endpoint": "https://example.com"
             }
         },
         {
-            "documentation": "For custom endpoint with fips disabled and dualstack disabled",
+            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
                     "url": "https://example.com"
                 }
             },
             "params": {
-                "UseDualStack": false,
                 "UseFIPS": false,
-                "Region": "us-east-1",
+                "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -1520,9 +579,9 @@
                 "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
             },
             "params": {
-                "UseDualStack": false,
-                "UseFIPS": true,
                 "Region": "us-east-1",
+                "UseFIPS": true,
+                "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -1532,9 +591,9 @@
                 "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
             },
             "params": {
-                "UseDualStack": true,
-                "UseFIPS": false,
                 "Region": "us-east-1",
+                "UseFIPS": false,
+                "UseDualStack": true,
                 "Endpoint": "https://example.com"
             }
         }
diff --git a/tests/unit/docs/test_client.py b/tests/unit/docs/test_client.py
index ed43346e8a..800912de75 100644
--- a/tests/unit/docs/test_client.py
+++ b/tests/unit/docs/test_client.py
@@ -51,26 +51,26 @@ def test_document_client(self):
             ]
         )
         self.assert_contains_lines_in_order(
-            ['.. py:method:: can_paginate(operation_name)'],
+            ['.. py:method:: MyService.Client.can_paginate(operation_name)'],
             self.get_nested_service_contents(
                 'myservice', 'client', 'can_paginate'
             ),
         )
         self.assert_contains_lines_in_order(
-            ['.. py:method:: get_paginator(operation_name)'],
+            ['.. py:method:: MyService.Client.get_paginator(operation_name)'],
             self.get_nested_service_contents(
                 'myservice', 'client', 'get_paginator'
             ),
         )
         self.assert_contains_lines_in_order(
-            ['.. py:method:: get_waiter(waiter_name)'],
+            ['.. py:method:: MyService.Client.get_waiter(waiter_name)'],
             self.get_nested_service_contents(
                 'myservice', 'client', 'get_waiter'
             ),
         )
         self.assert_contains_lines_in_order(
             [
-                '.. py:method:: sample_operation(**kwargs)',
+                '.. py:method:: MyService.Client.sample_operation(**kwargs)',
                 '  **Request Syntax**',
                 '  ::',
                 '    response = client.sample_operation(',
diff --git a/tests/unit/docs/test_service.py b/tests/unit/docs/test_service.py
index c255d697ae..5b56246dec 100644
--- a/tests/unit/docs/test_service.py
+++ b/tests/unit/docs/test_service.py
@@ -79,7 +79,7 @@ def test_document_service(self):
 
         self.assert_contains_lines_in_order(
             [
-                '.. py:method:: sample_operation(**kwargs)',
+                '.. py:method:: MyService.Client.sample_operation(**kwargs)',
                 '  **Examples** ',
                 '  Sample Description.',
                 '  ::',