Repository: aws/aws-cli

Issue:
`aws cloudformation package` modifies certain string values to numbers
### CloudFormation template
#### `template.yml`
```yaml
Parameters:
  Value7:
    Type: String
    Default: "077777777777"
  Value8:
    Type: String
    Default: "088888888888"
  Value9:
    Type: String
    Default: "099999999999"
Resources:
  NestedStack:
    Type: AWS::CloudFormation::Stack
    Properties:
      TemplateURL: ./template_child.yml
```

#### `template_child.yml`
```yaml
# This template is not so important
Resources:
  Dummy:
    Type: Custom::Whatever
    Properties:
      ServiceToken: whatever
      Value1: whatever
```

### Commands to reproduce
```console
$ uname -a
uname -a
Darwin xxxxxxx 18.2.0 Darwin Kernel Version 18.2.0: Thu Dec 20 20:46:53 PST 2018; root:xnu-4903.241.1~1/RELEASE_X86_64 x86_64

$ aws --version
aws-cli/1.16.110 Python/3.7.2 Darwin/18.2.0 botocore/1.12.100

$ aws cloudformation package --s3-bucket BUCKET_NAME --template-file template.yml                                                           
Uploading to 137ce8b72427772da39a43ddc087908a.template  101 / 101.0  (100.00%)
Parameters:
  Value7:
    Type: String
    Default: '077777777777'
  Value8:
    Type: String
    Default: 088888888888
  Value9:
    Type: String
    Default: 099999999999
Resources:
  NestedStack:
    Type: AWS::CloudFormation::Stack
    Properties:
      TemplateURL: https://s3.amazonaws.com/BUCKET_NAME/137ce8b72427772da39a43ddc087908a.template
```

Quotes of `Value8` and `Value9` are removed after `aws cloudformation package`.
This make value into something like `9.9999999999E10` in the stacks.

Discussion:
codecov-commenter: ## [Codecov](https://codecov.io/gh/aws/aws-cli/pull/7787?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws) Report
> Merging [#7787](https://codecov.io/gh/aws/aws-cli/pull/7787?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws) (9d8fe37) into [v2](https://codecov.io/gh/aws/aws-cli/commit/192185ee6a1508c80568a1c5b0596971300c8be5?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws) (192185e) will **decrease** coverage by `0.15%`.
> The diff coverage is `100.00%`.

```diff
@@            Coverage Diff             @@
##               v2    #7787      +/-   ##
==========================================
- Coverage   93.05%   92.91%   -0.15%     
==========================================
  Files         354      354              
  Lines       37465    37446      -19     
  Branches     6012     5440     -572     
==========================================
- Hits        34864    34793      -71     
- Misses       1947     1981      +34     
- Partials      654      672      +18     
```


| [Impacted Files](https://codecov.io/gh/aws/aws-cli/pull/7787?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws) | Coverage Δ | |
|---|---|---|
| [awscli/customizations/cloudformation/yamlhelper.py](https://codecov.io/gh/aws/aws-cli/pull/7787?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws#diff-YXdzY2xpL2N1c3RvbWl6YXRpb25zL2Nsb3VkZm9ybWF0aW9uL3lhbWxoZWxwZXIucHk=) | `100.00% <100.00%> (ø)` | |

... and [31 files with indirect coverage changes](https://codecov.io/gh/aws/aws-cli/pull/7787/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws)

Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws). Have a feature suggestion? [Share it here.](https://app.codecov.io/gh/feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=aws)


Patch:
diff --git a/.changes/1.27.101.json b/.changes/1.27.101.json
deleted file mode 100644
index 56ced0b4e..000000000
--- a/.changes/1.27.101.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "category": "``iot-data``",
-    "description": "Add endpoint ruleset support for cn-north-1.",
-    "type": "api-change"
-  },
-  {
-    "category": "``ssm-contacts``",
-    "description": "This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information",
-    "type": "api-change"
-  },
-  {
-    "category": "``ssm-incidents``",
-    "description": "Increased maximum length of \"TriggerDetails.rawData\" to 10K characters and \"IncidentSummary\" to 8K characters.",
-    "type": "api-change"
-  }
-]
\ No newline at end of file
diff --git a/.changes/2.11.7.json b/.changes/2.11.7.json
deleted file mode 100644
index 7b8c0e4d4..000000000
--- a/.changes/2.11.7.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-  {
-    "category": "``voice-id``",
-    "description": "Amazon Connect Voice ID now supports multiple fraudster watchlists. Every domain has a default watchlist where all existing fraudsters are placed by default. Custom watchlists may now be created, managed, and evaluated against for known fraudster detection.",
-    "type": "api-change"
-  },
-  {
-    "category": "``comprehend``",
-    "description": "This release adds a new field (FlywheelArn) to the EntitiesDetectionJobProperties object. The FlywheelArn field is returned in the DescribeEntitiesDetectionJob and ListEntitiesDetectionJobs responses when the EntitiesDetection job is started with a FlywheelArn instead of an EntityRecognizerArn .",
-    "type": "api-change"
-  },
-  {
-    "category": "``iotwireless``",
-    "description": "Introducing new APIs that enable Sidewalk devices to communicate with AWS IoT Core through Sidewalk gateways. This will empower AWS customers to connect Sidewalk devices with other AWS IoT Services, creating  possibilities for seamless integration and advanced device management.",
-    "type": "api-change"
-  },
-  {
-    "category": "``connect``",
-    "description": "This release introduces support for RelatedContactId in the StartChatContact API. Interactive message and interactive message response have been added to the list of supported message content types for this API as well.",
-    "type": "api-change"
-  },
-  {
-    "category": "``sagemaker``",
-    "description": "Fixed some improperly rendered links in SDK documentation.",
-    "type": "api-change"
-  },
-  {
-    "category": "``athena``",
-    "description": "Enforces a minimal level of encryption for the workgroup for query and calculation results that are written to Amazon S3. When enabled, workgroup users can set encryption only to the minimum level set by the administrator or higher when they submit queries.",
-    "type": "api-change"
-  },
-  {
-    "category": "``servicecatalog-appregistry``",
-    "description": "In this release, we started supporting ARN in applicationSpecifier and attributeGroupSpecifier. GetAttributeGroup, ListAttributeGroups and ListAttributeGroupsForApplication APIs will now have CreatedBy field in the response.",
-    "type": "api-change"
-  },
-  {
-    "category": "``cloudwatch``",
-    "description": "Update cloudwatch command to latest version",
-    "type": "api-change"
-  },
-  {
-    "category": "``ssm-incidents``",
-    "description": "Increased maximum length of \"TriggerDetails.rawData\" to 10K characters and \"IncidentSummary\" to 8K characters.",
-    "type": "api-change"
-  },
-  {
-    "category": "``rds``",
-    "description": "Added error code CreateCustomDBEngineVersionFault for when the create custom engine version for Custom engines fails.",
-    "type": "api-change"
-  },
-  {
-    "category": "dependency",
-    "description": "Update cryptography requirement from <39.0.3,>=3.3.2 to >=3.3.2,<40.0.2",
-    "type": "enhancement"
-  },
-  {
-    "category": "``chime-sdk-voice``",
-    "description": "Documentation updates for Amazon Chime SDK Voice.",
-    "type": "api-change"
-  },
-  {
-    "category": "``ssm-contacts``",
-    "description": "This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information",
-    "type": "api-change"
-  },
-  {
-    "category": "``medialive``",
-    "description": "AWS Elemental MediaLive now supports ID3 tag insertion for audio only HLS output groups. AWS Elemental Link devices now support tagging.",
-    "type": "api-change"
-  },
-  {
-    "category": "``securityhub``",
-    "description": "Added new resource detail objects to ASFF, including resources for AwsEksCluster, AWSS3Bucket, AwsEc2RouteTable and AwsEC2Instance.",
-    "type": "api-change"
-  },
-  {
-    "category": "``connectparticipant``",
-    "description": "This release provides an update to the SendMessage API to handle interactive message response content-types.",
-    "type": "api-change"
-  },
-  {
-    "category": "``iot-data``",
-    "description": "Add endpoint ruleset support for cn-north-1.",
-    "type": "api-change"
-  }
-]
\ No newline at end of file
diff --git a/.changes/next-release/apichange-athena-88113.json b/.changes/next-release/apichange-athena-88113.json
new file mode 100644
index 000000000..e2428cd68
--- /dev/null
+++ b/.changes/next-release/apichange-athena-88113.json
@@ -0,0 +1,5 @@
+{
+  "category": "``athena``",
+  "description": "Enforces a minimal level of encryption for the workgroup for query and calculation results that are written to Amazon S3. When enabled, workgroup users can set encryption only to the minimum level set by the administrator or higher when they submit queries.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-chimesdkvoice-49564.json b/.changes/next-release/apichange-chimesdkvoice-49564.json
new file mode 100644
index 000000000..fe745bde7
--- /dev/null
+++ b/.changes/next-release/apichange-chimesdkvoice-49564.json
@@ -0,0 +1,5 @@
+{
+  "category": "``chime-sdk-voice``",
+  "description": "Documentation updates for Amazon Chime SDK Voice.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-cloudwatch-35803.json b/.changes/next-release/apichange-cloudwatch-35803.json
new file mode 100644
index 000000000..a5af7d9b5
--- /dev/null
+++ b/.changes/next-release/apichange-cloudwatch-35803.json
@@ -0,0 +1,5 @@
+{
+  "category": "``cloudwatch``",
+  "description": "Update cloudwatch command to latest version",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-comprehend-11471.json b/.changes/next-release/apichange-comprehend-11471.json
new file mode 100644
index 000000000..fdb688f68
--- /dev/null
+++ b/.changes/next-release/apichange-comprehend-11471.json
@@ -0,0 +1,5 @@
+{
+  "category": "``comprehend``",
+  "description": "This release adds a new field (FlywheelArn) to the EntitiesDetectionJobProperties object. The FlywheelArn field is returned in the DescribeEntitiesDetectionJob and ListEntitiesDetectionJobs responses when the EntitiesDetection job is started with a FlywheelArn instead of an EntityRecognizerArn .",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-connect-93061.json b/.changes/next-release/apichange-connect-93061.json
new file mode 100644
index 000000000..1717bb9be
--- /dev/null
+++ b/.changes/next-release/apichange-connect-93061.json
@@ -0,0 +1,5 @@
+{
+  "category": "``connect``",
+  "description": "This release introduces support for RelatedContactId in the StartChatContact API. Interactive message and interactive message response have been added to the list of supported message content types for this API as well.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-connectparticipant-28733.json b/.changes/next-release/apichange-connectparticipant-28733.json
new file mode 100644
index 000000000..ba4630504
--- /dev/null
+++ b/.changes/next-release/apichange-connectparticipant-28733.json
@@ -0,0 +1,5 @@
+{
+  "category": "``connectparticipant``",
+  "description": "This release provides an update to the SendMessage API to handle interactive message response content-types.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-iotwireless-49181.json b/.changes/next-release/apichange-iotwireless-49181.json
new file mode 100644
index 000000000..627944075
--- /dev/null
+++ b/.changes/next-release/apichange-iotwireless-49181.json
@@ -0,0 +1,5 @@
+{
+  "category": "``iotwireless``",
+  "description": "Introducing new APIs that enable Sidewalk devices to communicate with AWS IoT Core through Sidewalk gateways. This will empower AWS customers to connect Sidewalk devices with other AWS IoT Services, creating  possibilities for seamless integration and advanced device management.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-medialive-81501.json b/.changes/next-release/apichange-medialive-81501.json
new file mode 100644
index 000000000..54e577e40
--- /dev/null
+++ b/.changes/next-release/apichange-medialive-81501.json
@@ -0,0 +1,5 @@
+{
+  "category": "``medialive``",
+  "description": "AWS Elemental MediaLive now supports ID3 tag insertion for audio only HLS output groups. AWS Elemental Link devices now support tagging.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-rds-4317.json b/.changes/next-release/apichange-rds-4317.json
new file mode 100644
index 000000000..f98d51a71
--- /dev/null
+++ b/.changes/next-release/apichange-rds-4317.json
@@ -0,0 +1,5 @@
+{
+  "category": "``rds``",
+  "description": "Added error code CreateCustomDBEngineVersionFault for when the create custom engine version for Custom engines fails.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-sagemaker-30872.json b/.changes/next-release/apichange-sagemaker-30872.json
new file mode 100644
index 000000000..cd2bced4f
--- /dev/null
+++ b/.changes/next-release/apichange-sagemaker-30872.json
@@ -0,0 +1,5 @@
+{
+  "category": "``sagemaker``",
+  "description": "Fixed some improperly rendered links in SDK documentation.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-securityhub-722.json b/.changes/next-release/apichange-securityhub-722.json
new file mode 100644
index 000000000..1c0ef5f4c
--- /dev/null
+++ b/.changes/next-release/apichange-securityhub-722.json
@@ -0,0 +1,5 @@
+{
+  "category": "``securityhub``",
+  "description": "Added new resource detail objects to ASFF, including resources for AwsEksCluster, AWSS3Bucket, AwsEc2RouteTable and AwsEC2Instance.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-servicecatalogappregistry-76247.json b/.changes/next-release/apichange-servicecatalogappregistry-76247.json
new file mode 100644
index 000000000..79de4d3f3
--- /dev/null
+++ b/.changes/next-release/apichange-servicecatalogappregistry-76247.json
@@ -0,0 +1,5 @@
+{
+  "category": "``servicecatalog-appregistry``",
+  "description": "In this release, we started supporting ARN in applicationSpecifier and attributeGroupSpecifier. GetAttributeGroup, ListAttributeGroups and ListAttributeGroupsForApplication APIs will now have CreatedBy field in the response.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/apichange-voiceid-67251.json b/.changes/next-release/apichange-voiceid-67251.json
new file mode 100644
index 000000000..0ff6c0b41
--- /dev/null
+++ b/.changes/next-release/apichange-voiceid-67251.json
@@ -0,0 +1,5 @@
+{
+  "category": "``voice-id``",
+  "description": "Amazon Connect Voice ID now supports multiple fraudster watchlists. Every domain has a default watchlist where all existing fraudsters are placed by default. Custom watchlists may now be created, managed, and evaluated against for known fraudster detection.",
+  "type": "api-change"
+}
\ No newline at end of file
diff --git a/.changes/next-release/bugfix-argumentparsing-97824.json b/.changes/next-release/bugfix-argumentparsing-97824.json
deleted file mode 100644
index 111601548..000000000
--- a/.changes/next-release/bugfix-argumentparsing-97824.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type": "bugfix",
-  "category": "argument parsing",
-  "description": "Fixes issue reported in `#303 <https://github.com/aws/aws-cli/issues/303>`__ involving -h/--help output"
-}
diff --git a/.changes/next-release/bugfix-cloudformation-20253.json b/.changes/next-release/bugfix-cloudformation-20253.json
new file mode 100644
index 000000000..0723ca29e
--- /dev/null
+++ b/.changes/next-release/bugfix-cloudformation-20253.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "cloudformation",
+  "description": "Fixes `#3991 <https://github.com/aws/aws-cli/issues/3991>`__. Use YAML 1.1 spec in alignment with CloudFormation YAML support."
+}
diff --git a/.changes/next-release/enhancement-dependency-99303.json b/.changes/next-release/enhancement-dependency-99303.json
new file mode 100644
index 000000000..4d955e02a
--- /dev/null
+++ b/.changes/next-release/enhancement-dependency-99303.json
@@ -0,0 +1,5 @@
+{
+  "type": "enhancement",
+  "category": "dependency",
+  "description": "Update cryptography requirement from <39.0.3,>=3.3.2 to >=3.3.2,<40.0.2"
+}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2f865da47..79c8fd5cf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,28 +2,6 @@
 CHANGELOG
 =========
 
-2.11.7
-======
-
-* api-change:``voice-id``: Amazon Connect Voice ID now supports multiple fraudster watchlists. Every domain has a default watchlist where all existing fraudsters are placed by default. Custom watchlists may now be created, managed, and evaluated against for known fraudster detection.
-* api-change:``comprehend``: This release adds a new field (FlywheelArn) to the EntitiesDetectionJobProperties object. The FlywheelArn field is returned in the DescribeEntitiesDetectionJob and ListEntitiesDetectionJobs responses when the EntitiesDetection job is started with a FlywheelArn instead of an EntityRecognizerArn .
-* api-change:``iotwireless``: Introducing new APIs that enable Sidewalk devices to communicate with AWS IoT Core through Sidewalk gateways. This will empower AWS customers to connect Sidewalk devices with other AWS IoT Services, creating  possibilities for seamless integration and advanced device management.
-* api-change:``connect``: This release introduces support for RelatedContactId in the StartChatContact API. Interactive message and interactive message response have been added to the list of supported message content types for this API as well.
-* api-change:``sagemaker``: Fixed some improperly rendered links in SDK documentation.
-* api-change:``athena``: Enforces a minimal level of encryption for the workgroup for query and calculation results that are written to Amazon S3. When enabled, workgroup users can set encryption only to the minimum level set by the administrator or higher when they submit queries.
-* api-change:``servicecatalog-appregistry``: In this release, we started supporting ARN in applicationSpecifier and attributeGroupSpecifier. GetAttributeGroup, ListAttributeGroups and ListAttributeGroupsForApplication APIs will now have CreatedBy field in the response.
-* api-change:``cloudwatch``: Update cloudwatch command to latest version
-* api-change:``ssm-incidents``: Increased maximum length of "TriggerDetails.rawData" to 10K characters and "IncidentSummary" to 8K characters.
-* api-change:``rds``: Added error code CreateCustomDBEngineVersionFault for when the create custom engine version for Custom engines fails.
-* enhancement:dependency: Update cryptography requirement from <39.0.3,>=3.3.2 to >=3.3.2,<40.0.2
-* api-change:``chime-sdk-voice``: Documentation updates for Amazon Chime SDK Voice.
-* api-change:``ssm-contacts``: This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information
-* api-change:``medialive``: AWS Elemental MediaLive now supports ID3 tag insertion for audio only HLS output groups. AWS Elemental Link devices now support tagging.
-* api-change:``securityhub``: Added new resource detail objects to ASFF, including resources for AwsEksCluster, AWSS3Bucket, AwsEc2RouteTable and AwsEC2Instance.
-* api-change:``connectparticipant``: This release provides an update to the SendMessage API to handle interactive message response content-types.
-* api-change:``iot-data``: Add endpoint ruleset support for cn-north-1.
-
-
 2.11.6
 ======
 
@@ -5119,14 +5097,6 @@ CHANGELOG
 * feature:wizard: Added support for AWS CLI Wizards. See `#3752 <https://github.com/aws/aws-cli/issues/3752>`__.
 
 
-1.27.101
-========
-
-* api-change:``iot-data``: Add endpoint ruleset support for cn-north-1.
-* api-change:``ssm-contacts``: This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information
-* api-change:``ssm-incidents``: Increased maximum length of "TriggerDetails.rawData" to 10K characters and "IncidentSummary" to 8K characters.
-
-
 1.27.100
 ========
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 177c7b76e..0010495eb 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -19,7 +19,7 @@ import os
 import importlib.abc
 import sys
 
-__version__ = '2.11.7'
+__version__ = '2.11.6'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/awscli/argparser.py b/awscli/argparser.py
index 980164afe..c2031a5f5 100644
--- a/awscli/argparser.py
+++ b/awscli/argparser.py
@@ -277,7 +277,6 @@ class SubCommandArgParser(ArgTableArgParser):
 
 class FirstPassGlobalArgParser(CLIArgParser):
     def __init__(self, *args, **kwargs):
-        kwargs['add_help'] = False
         super().__init__(*args, **kwargs)
         self._build()
 
diff --git a/awscli/botocore/data/endpoints.json b/awscli/botocore/data/endpoints.json
index 3daa107c0..609333b89 100644
--- a/awscli/botocore/data/endpoints.json
+++ b/awscli/botocore/data/endpoints.json
@@ -10153,7 +10153,6 @@
           "eu-central-2" : { },
           "eu-north-1" : { },
           "eu-south-1" : { },
-          "eu-south-2" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "me-central-1" : { },
@@ -10222,7 +10221,6 @@
             "deprecated" : true,
             "hostname" : "mgn-fips.us-west-2.amazonaws.com"
           },
-          "me-central-1" : { },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
diff --git a/awscli/botocore/data/iot-data/2015-05-28/endpoint-rule-set-1.json b/awscli/botocore/data/iot-data/2015-05-28/endpoint-rule-set-1.json
index 89de6446a..637371bc2 100644
--- a/awscli/botocore/data/iot-data/2015-05-28/endpoint-rule-set-1.json
+++ b/awscli/botocore/data/iot-data/2015-05-28/endpoint-rule-set-1.json
@@ -32,12 +32,13 @@
         {
             "conditions": [
                 {
-                    "fn": "isSet",
+                    "fn": "aws.partition",
                     "argv": [
                         {
-                            "ref": "Endpoint"
+                            "ref": "Region"
                         }
-                    ]
+                    ],
+                    "assign": "PartitionResult"
                 }
             ],
             "type": "tree",
@@ -45,20 +46,23 @@
                 {
                     "conditions": [
                         {
-                            "fn": "booleanEquals",
+                            "fn": "isSet",
                             "argv": [
                                 {
-                                    "ref": "UseFIPS"
-                                },
-                                true
+                                    "ref": "Endpoint"
+                                }
                             ]
+                        },
+                        {
+                            "fn": "parseURL",
+                            "argv": [
+                                {
+                                    "ref": "Endpoint"
+                                }
+                            ],
+                            "assign": "url"
                         }
                     ],
-                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
                     "type": "tree",
                     "rules": [
                         {
@@ -67,42 +71,67 @@
                                     "fn": "booleanEquals",
                                     "argv": [
                                         {
-                                            "ref": "UseDualStack"
+                                            "ref": "UseFIPS"
                                         },
                                         true
                                     ]
                                 }
                             ],
-                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                            "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
                             "type": "error"
                         },
                         {
                             "conditions": [],
-                            "endpoint": {
-                                "url": {
-                                    "ref": "Endpoint"
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                                    "type": "error"
                                 },
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": {
+                                            "ref": "Endpoint"
+                                        },
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
                         }
                     ]
-                }
-            ]
-        },
-        {
-            "conditions": [],
-            "type": "tree",
-            "rules": [
+                },
                 {
                     "conditions": [
                         {
-                            "fn": "isSet",
+                            "fn": "booleanEquals",
                             "argv": [
                                 {
-                                    "ref": "Region"
-                                }
+                                    "ref": "UseFIPS"
+                                },
+                                true
+                            ]
+                        },
+                        {
+                            "fn": "booleanEquals",
+                            "argv": [
+                                {
+                                    "ref": "UseDualStack"
+                                },
+                                true
                             ]
                         }
                     ],
@@ -111,352 +140,151 @@
                         {
                             "conditions": [
                                 {
-                                    "fn": "aws.partition",
+                                    "fn": "booleanEquals",
                                     "argv": [
+                                        true,
                                         {
-                                            "ref": "Region"
-                                        }
-                                    ],
-                                    "assign": "PartitionResult"
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
+                                                "supportsFIPS"
                                             ]
-                                        },
+                                        }
+                                    ]
+                                },
+                                {
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseDualStack"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
+                                                "supportsDualStack"
                                             ]
                                         }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://data-ats.iot-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"
-                                        }
                                     ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://data-ats.iot-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": [
                                 {
-                                    "conditions": [
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
+                                                "supportsFIPS"
                                             ]
                                         }
-                                    ],
+                                    ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
                                     "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
-                                                    "fn": "booleanEquals",
+                                                    "fn": "stringEquals",
                                                     "argv": [
-                                                        true,
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
+                                                            "ref": "Region"
+                                                        },
+                                                        "us-east-1"
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
-                                            "rules": [
+                                            "endpoint": {
+                                                "url": "https://data.iot-fips.us-east-1.amazonaws.com",
+                                                "properties": {},
+                                                "headers": {}
+                                            },
+                                            "type": "endpoint"
+                                        },
+                                        {
+                                            "conditions": [
                                                 {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "ca-central-1"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.ca-central-1.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-east-1"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-east-1.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-east-2"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-east-2.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-west-1"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-west-1.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-west-2"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-west-2.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
-                                                        {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-gov-east-1"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-gov-east-1.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        },
+                                                    "fn": "stringEquals",
+                                                    "argv": [
                                                         {
-                                                            "conditions": [
-                                                                {
-                                                                    "fn": "stringEquals",
-                                                                    "argv": [
-                                                                        {
-                                                                            "ref": "Region"
-                                                                        },
-                                                                        "us-gov-west-1"
-                                                                    ]
-                                                                }
-                                                            ],
-                                                            "endpoint": {
-                                                                "url": "https://data.iot-fips.us-gov-west-1.amazonaws.com",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
+                                                            "ref": "Region"
                                                         },
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://data-ats.iot-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
+                                                        "us-east-2"
                                                     ]
                                                 }
-                                            ]
+                                            ],
+                                            "endpoint": {
+                                                "url": "https://data.iot-fips.us-east-2.amazonaws.com",
+                                                "properties": {},
+                                                "headers": {}
+                                            },
+                                            "type": "endpoint"
                                         },
-                                        {
-                                            "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",
+                                                    "fn": "stringEquals",
                                                     "argv": [
-                                                        true,
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
+                                                            "ref": "Region"
+                                                        },
+                                                        "ca-central-1"
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://data-ats.iot.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
+                                            "endpoint": {
+                                                "url": "https://data.iot-fips.ca-central-1.amazonaws.com",
+                                                "properties": {},
+                                                "headers": {}
+                                            },
+                                            "type": "endpoint"
                                         },
-                                        {
-                                            "conditions": [],
-                                            "error": "DualStack is enabled but this partition does not support DualStack",
-                                            "type": "error"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "conditions": [],
-                                    "type": "tree",
-                                    "rules": [
                                         {
                                             "conditions": [
                                                 {
@@ -465,12 +293,12 @@
                                                         {
                                                             "ref": "Region"
                                                         },
-                                                        "cn-north-1"
+                                                        "us-west-1"
                                                     ]
                                                 }
                                             ],
                                             "endpoint": {
-                                                "url": "https://data.ats.iot.cn-north-1.amazonaws.com.cn",
+                                                "url": "https://data.iot-fips.us-west-1.amazonaws.com",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -481,21 +309,15 @@
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws",
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "name"
-                                                            ]
-                                                        }
+                                                            "ref": "Region"
+                                                        },
+                                                        "us-west-2"
                                                     ]
                                                 }
                                             ],
                                             "endpoint": {
-                                                "url": "https://data-ats.iot.{Region}.amazonaws.com",
+                                                "url": "https://data.iot-fips.us-west-2.amazonaws.com",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -506,21 +328,15 @@
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-cn",
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "name"
-                                                            ]
-                                                        }
+                                                            "ref": "Region"
+                                                        },
+                                                        "us-gov-west-1"
                                                     ]
                                                 }
                                             ],
                                             "endpoint": {
-                                                "url": "https://data-ats.iot.{Region}.amazonaws.com.cn",
+                                                "url": "https://data.iot-fips.us-gov-west-1.amazonaws.com",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -531,21 +347,15 @@
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "name"
-                                                            ]
-                                                        }
+                                                            "ref": "Region"
+                                                        },
+                                                        "us-gov-east-1"
                                                     ]
                                                 }
                                             ],
                                             "endpoint": {
-                                                "url": "https://data-ats.iot.{Region}.amazonaws.com",
+                                                "url": "https://data.iot-fips.us-gov-east-1.amazonaws.com",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -554,7 +364,7 @@
                                         {
                                             "conditions": [],
                                             "endpoint": {
-                                                "url": "https://data-ats.iot.{Region}.{PartitionResult#dnsSuffix}",
+                                                "url": "https://data-ats.iot-fips.{Region}.{PartitionResult#dnsSuffix}",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -563,13 +373,74 @@
                                     ]
                                 }
                             ]
+                        },
+                        {
+                            "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,
+                                        {
+                                            "fn": "getAttr",
+                                            "argv": [
+                                                {
+                                                    "ref": "PartitionResult"
+                                                },
+                                                "supportsDualStack"
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://data-ats.iot.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
+                        },
+                        {
+                            "conditions": [],
+                            "error": "DualStack is enabled but this partition does not support DualStack",
+                            "type": "error"
                         }
                     ]
                 },
                 {
                     "conditions": [],
-                    "error": "Invalid Configuration: Missing Region",
-                    "type": "error"
+                    "endpoint": {
+                        "url": "https://data-ats.iot.{Region}.{PartitionResult#dnsSuffix}",
+                        "properties": {},
+                        "headers": {}
+                    },
+                    "type": "endpoint"
                 }
             ]
         }
diff --git a/awscli/botocore/data/ssm-contacts/2021-05-03/endpoint-rule-set-1.json b/awscli/botocore/data/ssm-contacts/2021-05-03/endpoint-rule-set-1.json
index dc2786c87..ae305170a 100644
--- a/awscli/botocore/data/ssm-contacts/2021-05-03/endpoint-rule-set-1.json
+++ b/awscli/botocore/data/ssm-contacts/2021-05-03/endpoint-rule-set-1.json
@@ -32,12 +32,13 @@
         {
             "conditions": [
                 {
-                    "fn": "isSet",
+                    "fn": "aws.partition",
                     "argv": [
                         {
-                            "ref": "Endpoint"
+                            "ref": "Region"
                         }
-                    ]
+                    ],
+                    "assign": "PartitionResult"
                 }
             ],
             "type": "tree",
@@ -45,20 +46,23 @@
                 {
                     "conditions": [
                         {
-                            "fn": "booleanEquals",
+                            "fn": "isSet",
                             "argv": [
                                 {
-                                    "ref": "UseFIPS"
-                                },
-                                true
+                                    "ref": "Endpoint"
+                                }
                             ]
+                        },
+                        {
+                            "fn": "parseURL",
+                            "argv": [
+                                {
+                                    "ref": "Endpoint"
+                                }
+                            ],
+                            "assign": "url"
                         }
                     ],
-                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
                     "type": "tree",
                     "rules": [
                         {
@@ -67,42 +71,67 @@
                                     "fn": "booleanEquals",
                                     "argv": [
                                         {
-                                            "ref": "UseDualStack"
+                                            "ref": "UseFIPS"
                                         },
                                         true
                                     ]
                                 }
                             ],
-                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                            "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
                             "type": "error"
                         },
                         {
                             "conditions": [],
-                            "endpoint": {
-                                "url": {
-                                    "ref": "Endpoint"
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                                    "type": "error"
                                 },
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": {
+                                            "ref": "Endpoint"
+                                        },
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
                         }
                     ]
-                }
-            ]
-        },
-        {
-            "conditions": [],
-            "type": "tree",
-            "rules": [
+                },
                 {
                     "conditions": [
                         {
-                            "fn": "isSet",
+                            "fn": "booleanEquals",
                             "argv": [
                                 {
-                                    "ref": "Region"
-                                }
+                                    "ref": "UseFIPS"
+                                },
+                                true
+                            ]
+                        },
+                        {
+                            "fn": "booleanEquals",
+                            "argv": [
+                                {
+                                    "ref": "UseDualStack"
+                                },
+                                true
                             ]
                         }
                     ],
@@ -111,238 +140,168 @@
                         {
                             "conditions": [
                                 {
-                                    "fn": "aws.partition",
+                                    "fn": "booleanEquals",
                                     "argv": [
+                                        true,
                                         {
-                                            "ref": "Region"
-                                        }
-                                    ],
-                                    "assign": "PartitionResult"
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
-                                            ]
-                                        },
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseDualStack"
-                                                },
-                                                true
+                                                "supportsFIPS"
                                             ]
                                         }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
+                                    ]
+                                },
+                                {
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "conditions": [
+                                            "fn": "getAttr",
+                                            "argv": [
                                                 {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
-                                                    ]
+                                                    "ref": "PartitionResult"
                                                 },
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://ssm-contacts-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
+                                                "supportsDualStack"
                                             ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
-                                            "type": "error"
                                         }
                                     ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://ssm-contacts-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": [
                                 {
-                                    "conditions": [
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                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://ssm-contacts-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
+                                                "supportsFIPS"
                                             ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS is enabled but this partition does not support FIPS",
-                                            "type": "error"
                                         }
                                     ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://ssm-contacts-fips.{Region}.{PartitionResult#dnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
+                        },
+                        {
+                            "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": [
                                 {
-                                    "conditions": [
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseDualStack"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                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://ssm-contacts.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
+                                                "supportsDualStack"
                                             ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "DualStack is enabled but this partition does not support DualStack",
-                                            "type": "error"
                                         }
                                     ]
-                                },
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
                                 {
                                     "conditions": [],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://ssm-contacts.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
-                                        }
-                                    ]
+                                    "endpoint": {
+                                        "url": "https://ssm-contacts.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 }
                             ]
+                        },
+                        {
+                            "conditions": [],
+                            "error": "DualStack is enabled but this partition does not support DualStack",
+                            "type": "error"
                         }
                     ]
                 },
                 {
                     "conditions": [],
-                    "error": "Invalid Configuration: Missing Region",
-                    "type": "error"
+                    "endpoint": {
+                        "url": "https://ssm-contacts.{Region}.{PartitionResult#dnsSuffix}",
+                        "properties": {},
+                        "headers": {}
+                    },
+                    "type": "endpoint"
                 }
             ]
         }
diff --git a/awscli/botocore/data/ssm-contacts/2021-05-03/paginators-1.json b/awscli/botocore/data/ssm-contacts/2021-05-03/paginators-1.json
index 621bde80e..72f57ad84 100644
--- a/awscli/botocore/data/ssm-contacts/2021-05-03/paginators-1.json
+++ b/awscli/botocore/data/ssm-contacts/2021-05-03/paginators-1.json
@@ -35,35 +35,6 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "Pages"
-    },
-    "ListPageResolutions": {
-      "input_token": "NextToken",
-      "output_token": "NextToken",
-      "result_key": "PageResolutions"
-    },
-    "ListPreviewRotationShifts": {
-      "input_token": "NextToken",
-      "limit_key": "MaxResults",
-      "output_token": "NextToken",
-      "result_key": "RotationShifts"
-    },
-    "ListRotationOverrides": {
-      "input_token": "NextToken",
-      "limit_key": "MaxResults",
-      "output_token": "NextToken",
-      "result_key": "RotationOverrides"
-    },
-    "ListRotationShifts": {
-      "input_token": "NextToken",
-      "limit_key": "MaxResults",
-      "output_token": "NextToken",
-      "result_key": "RotationShifts"
-    },
-    "ListRotations": {
-      "input_token": "NextToken",
-      "limit_key": "MaxResults",
-      "output_token": "NextToken",
-      "result_key": "Rotations"
     }
   }
 }
diff --git a/awscli/botocore/data/ssm-contacts/2021-05-03/service-2.json b/awscli/botocore/data/ssm-contacts/2021-05-03/service-2.json
index b9e93f81c..2c8bc78bb 100644
--- a/awscli/botocore/data/ssm-contacts/2021-05-03/service-2.json
+++ b/awscli/botocore/data/ssm-contacts/2021-05-03/service-2.json
@@ -65,7 +65,7 @@
         {"shape":"ValidationException"},
         {"shape":"DataEncryptionException"}
       ],
-      "documentation":"<p>Contacts are either the contacts that Incident Manager engages during an incident or the escalation plans that Incident Manager uses to engage contacts in phases during an incident.</p>"
+      "documentation":"<p>Contacts are either the contacts that Incident Manager engages during an incident or the escalation plans that Incident Manager uses to engage contacts in phases during an incident. </p>"
     },
     "CreateContactChannel":{
       "name":"CreateContactChannel",
@@ -85,42 +85,6 @@
       ],
       "documentation":"<p>A contact channel is the method that Incident Manager uses to engage your contact.</p>"
     },
-    "CreateRotation":{
-      "name":"CreateRotation",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"CreateRotationRequest"},
-      "output":{"shape":"CreateRotationResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Creates a rotation in an on-call schedule.</p>"
-    },
-    "CreateRotationOverride":{
-      "name":"CreateRotationOverride",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"CreateRotationOverrideRequest"},
-      "output":{"shape":"CreateRotationOverrideResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Creates an override for a rotation in an on-call schedule.</p>"
-    },
     "DeactivateContactChannel":{
       "name":"DeactivateContactChannel",
       "http":{
@@ -151,7 +115,6 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"}
       ],
       "documentation":"<p>To remove a contact from Incident Manager, you can delete the contact. Deleting a contact removes them from all escalation plans and related response plans. Deleting an escalation plan removes it from all related response plans. You will have to recreate the contact and its contact channels before you can use it again.</p>"
@@ -173,41 +136,6 @@
       ],
       "documentation":"<p>To no longer receive engagements on a contact channel, you can delete the channel from a contact. Deleting the contact channel removes it from the contact's engagement plan. If you delete the only contact channel for a contact, you won't be able to engage that contact during an incident.</p>"
     },
-    "DeleteRotation":{
-      "name":"DeleteRotation",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteRotationRequest"},
-      "output":{"shape":"DeleteRotationResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"ConflictException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Deletes a rotation from the system. If a rotation belongs to more than one on-call schedule, this operation deletes it from all of them.</p>"
-    },
-    "DeleteRotationOverride":{
-      "name":"DeleteRotationOverride",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteRotationOverrideRequest"},
-      "output":{"shape":"DeleteRotationOverrideResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Deletes an existing override for an on-call rotation.</p>"
-    },
     "DescribeEngagement":{
       "name":"DescribeEngagement",
       "http":{
@@ -297,40 +225,6 @@
       ],
       "documentation":"<p>Retrieves the resource policies attached to the specified contact or escalation plan.</p>"
     },
-    "GetRotation":{
-      "name":"GetRotation",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetRotationRequest"},
-      "output":{"shape":"GetRotationResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Retrieves information about an on-call rotation.</p>"
-    },
-    "GetRotationOverride":{
-      "name":"GetRotationOverride",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetRotationOverrideRequest"},
-      "output":{"shape":"GetRotationOverrideResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Retrieves information about an override to an on-call rotation.</p>"
-    },
     "ListContactChannels":{
       "name":"ListContactChannels",
       "http":{
@@ -396,24 +290,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Lists all of the engagements to contact channels that have been acknowledged.</p>"
-    },
-    "ListPageResolutions":{
-      "name":"ListPageResolutions",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListPageResolutionsRequest"},
-      "output":{"shape":"ListPageResolutionsResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Returns the resolution path of an engagement. For example, the escalation plan engaged in an incident might target an on-call schedule that includes several contacts in a rotation, but just one contact on-call when the incident starts. The resolution path indicates the hierarchy of <i>escalation plan &gt; on-call schedule &gt; contact</i>.</p>"
+      "documentation":"<p>Lists all of the engagements to contact channels that have been acknowledged. </p>"
     },
     "ListPagesByContact":{
       "name":"ListPagesByContact",
@@ -449,74 +326,6 @@
       ],
       "documentation":"<p>Lists the engagements to contact channels that occurred by engaging a contact.</p>"
     },
-    "ListPreviewRotationShifts":{
-      "name":"ListPreviewRotationShifts",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListPreviewRotationShiftsRequest"},
-      "output":{"shape":"ListPreviewRotationShiftsResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Returns a list of shifts based on rotation configuration parameters.</p> <note> <p>The Incident Manager primarily uses this operation to populate the <b>Preview</b> calendar. It is not typically run by end users.</p> </note>"
-    },
-    "ListRotationOverrides":{
-      "name":"ListRotationOverrides",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListRotationOverridesRequest"},
-      "output":{"shape":"ListRotationOverridesResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Retrieves a list of overrides currently specified for an on-call rotation.</p>"
-    },
-    "ListRotationShifts":{
-      "name":"ListRotationShifts",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListRotationShiftsRequest"},
-      "output":{"shape":"ListRotationShiftsResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"ConflictException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Returns a list of shifts generated by an existing rotation in the system.</p>"
-    },
-    "ListRotations":{
-      "name":"ListRotations",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListRotationsRequest"},
-      "output":{"shape":"ListRotationsResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Retrieves a list of on-call rotations.</p>"
-    },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
       "http":{
@@ -622,7 +431,7 @@
         {"shape":"ServiceQuotaExceededException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Tags a contact or escalation plan. You can tag only contacts and escalation plans in the first region of your replication set.</p>"
+      "documentation":"<p>Tags a contact or escalation plan. You can tag only contacts and escalation plans in the first region of your replication set. </p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -639,7 +448,7 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Removes tags from the specified resource.</p>"
+      "documentation":"<p>Removes tags from the specified resource. </p>"
     },
     "UpdateContact":{
       "name":"UpdateContact",
@@ -658,7 +467,7 @@
         {"shape":"ValidationException"},
         {"shape":"DataEncryptionException"}
       ],
-      "documentation":"<p>Updates the contact or escalation plan specified.</p>"
+      "documentation":"<p>Updates the contact or escalation plan specified. </p>"
     },
     "UpdateContactChannel":{
       "name":"UpdateContactChannel",
@@ -678,24 +487,6 @@
         {"shape":"ValidationException"}
       ],
       "documentation":"<p>Updates a contact's contact channel.</p>"
-    },
-    "UpdateRotation":{
-      "name":"UpdateRotation",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"UpdateRotationRequest"},
-      "output":{"shape":"UpdateRotationResult"},
-      "errors":[
-        {"shape":"AccessDeniedException"},
-        {"shape":"ConflictException"},
-        {"shape":"InternalServerException"},
-        {"shape":"ResourceNotFoundException"},
-        {"shape":"ThrottlingException"},
-        {"shape":"ValidationException"}
-      ],
-      "documentation":"<p>Updates the information specified for an on-call rotation.</p>"
     }
   },
   "shapes":{
@@ -738,7 +529,7 @@
         },
         "AcceptCode":{
           "shape":"AcceptCode",
-          "documentation":"<p>A 6-digit code used to acknowledge the page.</p>"
+          "documentation":"<p>The accept code is a 6-digit code used to acknowledge the page.</p>"
         },
         "AcceptCodeValidation":{
           "shape":"AcceptCodeValidation",
@@ -780,7 +571,7 @@
         },
         "ActivationCode":{
           "shape":"ActivationCode",
-          "documentation":"<p>The code sent to the contact channel when it was created in the contact.</p>"
+          "documentation":"<p>The code sent to the contact channel when it was created in the contact. </p>"
         }
       }
     },
@@ -851,11 +642,7 @@
         },
         "ResourceType":{
           "shape":"String",
-          "documentation":"Type of the resource in use"
-        },
-        "DependentEntities":{
-          "shape":"DependentEntityList",
-          "documentation":"List of dependent entities containing information on relation type and resourceArns linked to the resource in use"
+          "documentation":"ype of the resource in use"
         }
       },
       "documentation":"<p>Updating or deleting a resource causes an inconsistent state.</p>",
@@ -926,7 +713,7 @@
         },
         "ActivationStatus":{
           "shape":"ActivationStatus",
-          "documentation":"<p>A Boolean value describing if the contact channel has been activated or not. If the contact channel isn't activated, Incident Manager can't engage the contact through it.</p>"
+          "documentation":"<p>A Boolean value describing if the contact channel has been activated or not. If the contact channel isn't activated, Incident Manager can't engage the contact through it. </p>"
         }
       },
       "documentation":"<p>The method that Incident Manager uses to engage a contact.</p>"
@@ -939,7 +726,7 @@
           "documentation":"<p>The format is dependent on the type of the contact channel. The following are the expected formats:</p> <ul> <li> <p>SMS - '+' followed by the country code and phone number</p> </li> <li> <p>VOICE - '+' followed by the country code and phone number</p> </li> <li> <p>EMAIL - any standard email format</p> </li> </ul>"
         }
       },
-      "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel.</p>"
+      "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel. </p>"
     },
     "ContactChannelList":{
       "type":"list",
@@ -970,8 +757,7 @@
       "type":"string",
       "enum":[
         "PERSONAL",
-        "ESCALATION",
-        "ONCALL_SCHEDULE"
+        "ESCALATION"
       ]
     },
     "ContactsList":{
@@ -984,24 +770,6 @@
       "min":1,
       "pattern":"^[.\\s\\S]*$"
     },
-    "CoverageTime":{
-      "type":"structure",
-      "members":{
-        "Start":{
-          "shape":"HandOffTime",
-          "documentation":"<p>Information about when the on-call rotation shift begins.</p>"
-        },
-        "End":{
-          "shape":"HandOffTime",
-          "documentation":"<p>Information about when the on-call rotation shift ends.</p>"
-        }
-      },
-      "documentation":"<p>Information about when an on-call shift begins and ends.</p>"
-    },
-    "CoverageTimes":{
-      "type":"list",
-      "member":{"shape":"CoverageTime"}
-    },
     "CreateContactChannelRequest":{
       "type":"structure",
       "required":[
@@ -1058,11 +826,11 @@
       "members":{
         "Alias":{
           "shape":"ContactAlias",
-          "documentation":"<p>The short name to quickly identify a contact or escalation plan. The contact alias must be unique and identifiable.</p>"
+          "documentation":"<p>The short name to quickly identify a contact or escalation plan. The contact alias must be unique and identifiable. </p>"
         },
         "DisplayName":{
           "shape":"ContactName",
-          "documentation":"<p>The full name of the contact or escalation plan.</p>"
+          "documentation":"<p>The full name of the contact or escalation plan. </p>"
         },
         "Type":{
           "shape":"ContactType",
@@ -1070,11 +838,11 @@
         },
         "Plan":{
           "shape":"Plan",
-          "documentation":"<p>A list of stages. A contact has an engagement plan with stages that contact specified contact channels. An escalation plan uses stages that contact specified contacts.</p>"
+          "documentation":"<p>A list of stages. A contact has an engagement plan with stages that contact specified contact channels. An escalation plan uses stages that contact specified contacts. </p>"
         },
         "Tags":{
           "shape":"TagsList",
-          "documentation":"<p>Adds a tag to the target. You can only tag resources created in the first Region of your replication set.</p>"
+          "documentation":"<p>Adds a tag to the target. You can only tag resources created in the first Region of your replication set. </p>"
         },
         "IdempotencyToken":{
           "shape":"IdempotencyToken",
@@ -1093,100 +861,6 @@
         }
       }
     },
-    "CreateRotationOverrideRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "NewContactIds",
-        "StartTime",
-        "EndTime"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation to create an override for.</p>"
-        },
-        "NewContactIds":{
-          "shape":"RotationOverrideContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts to replace those in the current on-call rotation with.</p> <p>If you want to include any current team members in the override shift, you must include their ARNs in the new contact ID list.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time when the override goes into effect.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time when the override ends.</p>"
-        },
-        "IdempotencyToken":{
-          "shape":"IdempotencyToken",
-          "documentation":"<p>A token that ensures that the operation is called only once with the specified details.</p>"
-        }
-      }
-    },
-    "CreateRotationOverrideResult":{
-      "type":"structure",
-      "required":["RotationOverrideId"],
-      "members":{
-        "RotationOverrideId":{
-          "shape":"Uuid",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the created rotation override.</p>"
-        }
-      }
-    },
-    "CreateRotationRequest":{
-      "type":"structure",
-      "required":[
-        "Name",
-        "ContactIds",
-        "TimeZoneId",
-        "Recurrence"
-      ],
-      "members":{
-        "Name":{
-          "shape":"RotationName",
-          "documentation":"<p>The name of the rotation.</p>"
-        },
-        "ContactIds":{
-          "shape":"RotationContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts to add to the rotation.</p> <p>The order that you list the contacts in is their shift order in the rotation schedule. To change the order of the contact's shifts, use the <a>UpdateRotation</a> operation.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time that the rotation goes into effect.</p>"
-        },
-        "TimeZoneId":{
-          "shape":"TimeZoneId",
-          "documentation":"<p>The time zone to base the rotation’s activity on in Internet Assigned Numbers Authority (IANA) format. For example: \"America/Los_Angeles\", \"UTC\", or \"Asia/Seoul\". For more information, see the <a href=\"https://www.iana.org/time-zones\">Time Zone Database</a> on the IANA website.</p> <note> <p>Designators for time zones that don’t support Daylight Savings Time rules, such as Pacific Standard Time (PST) and Pacific Daylight Time (PDT), are not supported.</p> </note>"
-        },
-        "Recurrence":{
-          "shape":"RecurrenceSettings",
-          "documentation":"<p>Information about the rule that specifies when a shift's team members rotate.</p>"
-        },
-        "Tags":{
-          "shape":"TagsList",
-          "documentation":"<p>Optional metadata to assign to the rotation. Tags enable you to categorize a resource in different ways, such as by purpose, owner, or environment. For more information, see <a href=\"https://docs.aws.amazon.com/incident-manager/latest/userguide/tagging.html\">Tagging Incident Manager resources</a> in the <i>Incident Manager User Guide</i>.</p>"
-        },
-        "IdempotencyToken":{
-          "shape":"IdempotencyToken",
-          "documentation":"<p>A token that ensures that the operation is called only once with the specified details.</p>"
-        }
-      }
-    },
-    "CreateRotationResult":{
-      "type":"structure",
-      "required":["RotationArn"],
-      "members":{
-        "RotationArn":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the created rotation.</p>"
-        }
-      }
-    },
-    "DailySettings":{
-      "type":"list",
-      "member":{"shape":"HandOffTime"}
-    },
     "DataEncryptionException":{
       "type":"structure",
       "required":["Message"],
@@ -1197,23 +871,6 @@
       "exception":true
     },
     "DateTime":{"type":"timestamp"},
-    "DayOfMonth":{
-      "type":"integer",
-      "max":31,
-      "min":1
-    },
-    "DayOfWeek":{
-      "type":"string",
-      "enum":[
-        "MON",
-        "TUE",
-        "WED",
-        "THU",
-        "FRI",
-        "SAT",
-        "SUN"
-      ]
-    },
     "DeactivateContactChannelRequest":{
       "type":"structure",
       "required":["ContactChannelId"],
@@ -1263,65 +920,6 @@
       "members":{
       }
     },
-    "DeleteRotationOverrideRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "RotationOverrideId"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation that was overridden.</p>"
-        },
-        "RotationOverrideId":{
-          "shape":"Uuid",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation override to delete.</p>"
-        }
-      }
-    },
-    "DeleteRotationOverrideResult":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteRotationRequest":{
-      "type":"structure",
-      "required":["RotationId"],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation to delete.</p>"
-        }
-      }
-    },
-    "DeleteRotationResult":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DependentEntity":{
-      "type":"structure",
-      "required":[
-        "RelationType",
-        "DependentResourceIds"
-      ],
-      "members":{
-        "RelationType":{
-          "shape":"String",
-          "documentation":"<p>The type of relationship between one resource and the other resource that it is related to or depends on.</p>"
-        },
-        "DependentResourceIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the dependent resources.</p>"
-        }
-      },
-      "documentation":"<p>Information about a resource that another resource is related to or depends on.</p> <p>For example, if a contact is a member of a rotation, the rotation is a dependent entity of the contact.</p>"
-    },
-    "DependentEntityList":{
-      "type":"list",
-      "member":{"shape":"DependentEntity"}
-    },
     "DescribeEngagementRequest":{
       "type":"structure",
       "required":["EngagementId"],
@@ -1532,7 +1130,7 @@
         },
         "DeliveryAddress":{
           "shape":"ContactChannelAddress",
-          "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel.</p>"
+          "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel. </p>"
         },
         "ActivationStatus":{
           "shape":"ActivationStatus",
@@ -1596,7 +1194,7 @@
         },
         "Type":{
           "shape":"ContactType",
-          "documentation":"<p>The type of contact, either <code>PERSONAL</code> or <code>ESCALATION</code>.</p>"
+          "documentation":"<p>The type of contact, either <code>PERSONAL</code> or <code>ESCALATION</code>. </p>"
         },
         "Plan":{
           "shape":"Plan",
@@ -1604,122 +1202,6 @@
         }
       }
     },
-    "GetRotationOverrideRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "RotationOverrideId"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the overridden rotation to retrieve information about.</p>"
-        },
-        "RotationOverrideId":{
-          "shape":"Uuid",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation override to retrieve information about.</p>"
-        }
-      }
-    },
-    "GetRotationOverrideResult":{
-      "type":"structure",
-      "members":{
-        "RotationOverrideId":{
-          "shape":"Uuid",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the override to an on-call rotation.</p>"
-        },
-        "RotationArn":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation that was overridden.</p>"
-        },
-        "NewContactIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts assigned to the override of the on-call rotation.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time when the override goes into effect.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time when the override ends.</p>"
-        },
-        "CreateTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time when the override was created.</p>"
-        }
-      }
-    },
-    "GetRotationRequest":{
-      "type":"structure",
-      "required":["RotationId"],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation to retrieve information about.</p>"
-        }
-      }
-    },
-    "GetRotationResult":{
-      "type":"structure",
-      "required":[
-        "RotationArn",
-        "Name",
-        "ContactIds",
-        "StartTime",
-        "TimeZoneId",
-        "Recurrence"
-      ],
-      "members":{
-        "RotationArn":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the on-call rotation.</p>"
-        },
-        "Name":{
-          "shape":"RotationName",
-          "documentation":"<p>The name of the on-call rotation.</p>"
-        },
-        "ContactIds":{
-          "shape":"RotationContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts assigned to the on-call rotation team.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The specified start time for the on-call rotation.</p>"
-        },
-        "TimeZoneId":{
-          "shape":"TimeZoneId",
-          "documentation":"<p>The time zone that the rotation’s activity is based on, in Internet Assigned Numbers Authority (IANA) format.</p>"
-        },
-        "Recurrence":{
-          "shape":"RecurrenceSettings",
-          "documentation":"<p>Specifies how long a rotation lasts before restarting at the beginning of the shift order.</p>"
-        }
-      }
-    },
-    "HandOffTime":{
-      "type":"structure",
-      "required":[
-        "HourOfDay",
-        "MinuteOfHour"
-      ],
-      "members":{
-        "HourOfDay":{
-          "shape":"HourOfDay",
-          "documentation":"<p>The hour when an on-call rotation shift begins or ends.</p>"
-        },
-        "MinuteOfHour":{
-          "shape":"MinuteOfHour",
-          "documentation":"<p>The minute when an on-call rotation shift begins or ends.</p>"
-        }
-      },
-      "documentation":"<p>Details about when an on-call rotation shift begins or ends.</p>"
-    },
-    "HourOfDay":{
-      "type":"integer",
-      "max":23,
-      "min":0
-    },
     "IdempotencyToken":{
       "type":"string",
       "max":2048,
@@ -1754,7 +1236,7 @@
       "members":{
         "ContactId":{
           "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the contact.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the contact. </p>"
         },
         "NextToken":{
           "shape":"PaginationToken",
@@ -1762,8 +1244,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of contact channels per page.</p>",
-          "box":true
+          "documentation":"<p>The maximum number of contact channels per page.</p>"
         }
       }
     },
@@ -1790,8 +1271,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of contacts and escalation plans per page of results.</p>",
-          "box":true
+          "documentation":"<p>The maximum number of contacts and escalation plans per page of results.</p>"
         },
         "AliasPrefix":{
           "shape":"ContactAlias",
@@ -1825,8 +1305,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of engagements per page of results.</p>",
-          "box":true
+          "documentation":"<p>The maximum number of engagements per page of results.</p>"
         },
         "IncidentId":{
           "shape":"IncidentId",
@@ -1866,8 +1345,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of acknowledgements per page of results.</p>",
-          "box":true
+          "documentation":"<p>The maximum number of acknowledgements per page of results.</p>"
         }
       }
     },
@@ -1884,34 +1362,6 @@
         }
       }
     },
-    "ListPageResolutionsRequest":{
-      "type":"structure",
-      "required":["PageId"],
-      "members":{
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>"
-        },
-        "PageId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the contact engaged for the incident.</p>"
-        }
-      }
-    },
-    "ListPageResolutionsResult":{
-      "type":"structure",
-      "required":["PageResolutions"],
-      "members":{
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
-        },
-        "PageResolutions":{
-          "shape":"ResolutionList",
-          "documentation":"<p>Information about the resolution for an engagement.</p>"
-        }
-      }
-    },
     "ListPagesByContactRequest":{
       "type":"structure",
       "required":["ContactId"],
@@ -1926,8 +1376,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of engagements to contact channels to list per page of results. </p>",
-          "box":true
+          "documentation":"<p>The maximum number of engagements to contact channels to list per page of results. </p>"
         }
       }
     },
@@ -1959,8 +1408,7 @@
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of engagements to contact channels to list per page of results.</p>",
-          "box":true
+          "documentation":"<p>The maximum number of engagements to contact channels to list per page of results.</p>"
         }
       }
     },
@@ -1978,186 +1426,6 @@
         }
       }
     },
-    "ListPreviewRotationShiftsRequest":{
-      "type":"structure",
-      "required":[
-        "EndTime",
-        "Members",
-        "TimeZoneId",
-        "Recurrence"
-      ],
-      "members":{
-        "RotationStartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time a rotation would begin. The first shift is calculated from this date and time.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>Used to filter the range of calculated shifts before sending the response back to the user. </p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time a rotation shift would end.</p>"
-        },
-        "Members":{
-          "shape":"RotationPreviewMemberList",
-          "documentation":"<p>The contacts that would be assigned to a rotation.</p>"
-        },
-        "TimeZoneId":{
-          "shape":"TimeZoneId",
-          "documentation":"<p>The time zone the rotation’s activity would be based on, in Internet Assigned Numbers Authority (IANA) format. For example: \"America/Los_Angeles\", \"UTC\", or \"Asia/Seoul\". </p>"
-        },
-        "Recurrence":{
-          "shape":"RecurrenceSettings",
-          "documentation":"<p>Information about how long a rotation would last before restarting at the beginning of the shift order.</p>"
-        },
-        "Overrides":{
-          "shape":"OverrideList",
-          "documentation":"<p>Information about changes that would be made in a rotation override.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>A token to start the list. This token is used to get the next set of results.</p>"
-        },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that can be specified in a subsequent call to get the next set of results.</p>",
-          "box":true
-        }
-      }
-    },
-    "ListPreviewRotationShiftsResult":{
-      "type":"structure",
-      "members":{
-        "RotationShifts":{
-          "shape":"RotationShifts",
-          "documentation":"<p>Details about a rotation shift, including times, types, and contacts.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>The token for the next set of items to return. This token is used to get the next set of results.</p>"
-        }
-      }
-    },
-    "ListRotationOverridesRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "StartTime",
-        "EndTime"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation to retrieve information about.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time for the beginning of a time range for listing overrides.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time for the end of a time range for listing overrides.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>"
-        },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
-          "box":true
-        }
-      }
-    },
-    "ListRotationOverridesResult":{
-      "type":"structure",
-      "members":{
-        "RotationOverrides":{
-          "shape":"RotationOverrides",
-          "documentation":"<p>A list of rotation overrides in the specified time range.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
-        }
-      }
-    },
-    "ListRotationShiftsRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "EndTime"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation to retrieve shift information about. </p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time for the beginning of the time range to list shifts for.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time for the end of the time range to list shifts for.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>"
-        },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
-          "box":true
-        }
-      }
-    },
-    "ListRotationShiftsResult":{
-      "type":"structure",
-      "members":{
-        "RotationShifts":{
-          "shape":"RotationShifts",
-          "documentation":"<p>Information about shifts that meet the filter criteria.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
-        }
-      }
-    },
-    "ListRotationsRequest":{
-      "type":"structure",
-      "members":{
-        "RotationNamePrefix":{
-          "shape":"RotationName",
-          "documentation":"<p>A filter to include rotations in list results based on their common prefix. For example, entering prod returns a list of all rotation names that begin with <code>prod</code>, such as <code>production</code> and <code>prod-1</code>.</p>"
-        },
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>"
-        },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
-          "box":true
-        }
-      }
-    },
-    "ListRotationsResult":{
-      "type":"structure",
-      "required":["Rotations"],
-      "members":{
-        "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
-        },
-        "Rotations":{
-          "shape":"Rotations",
-          "documentation":"<p>Information about rotations that meet the filter criteria.</p>"
-        }
-      }
-    },
     "ListTagsForResourceRequest":{
       "type":"structure",
       "required":["ResourceARN"],
@@ -2183,47 +1451,6 @@
       "max":1024,
       "min":0
     },
-    "Member":{
-      "type":"string",
-      "max":512,
-      "min":1,
-      "pattern":".*\\S.*"
-    },
-    "MinuteOfHour":{
-      "type":"integer",
-      "max":59,
-      "min":0
-    },
-    "MonthlySetting":{
-      "type":"structure",
-      "required":[
-        "DayOfMonth",
-        "HandOffTime"
-      ],
-      "members":{
-        "DayOfMonth":{
-          "shape":"DayOfMonth",
-          "documentation":"<p>The day of the month when monthly recurring on-call rotations begin.</p>"
-        },
-        "HandOffTime":{
-          "shape":"HandOffTime",
-          "documentation":"<p>The time of day when a monthly recurring on-call shift rotation begins.</p>"
-        }
-      },
-      "documentation":"<p>Information about on-call rotations that recur monthly.</p>"
-    },
-    "MonthlySettings":{
-      "type":"list",
-      "member":{"shape":"MonthlySetting"}
-    },
-    "NumberOfOnCalls":{
-      "type":"integer",
-      "min":1
-    },
-    "OverrideList":{
-      "type":"list",
-      "member":{"shape":"PreviewOverride"}
-    },
     "Page":{
       "type":"structure",
       "required":[
@@ -2279,17 +1506,14 @@
     },
     "Plan":{
       "type":"structure",
+      "required":["Stages"],
       "members":{
         "Stages":{
           "shape":"StagesList",
           "documentation":"<p>A list of stages that the escalation plan or engagement plan uses to engage contacts and contact methods.</p>"
-        },
-        "RotationIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the on-call rotations associated with the plan. </p>"
         }
       },
-      "documentation":"<p>Information about the stages and on-call rotation teams associated with an escalation plan or engagement plan. </p>"
+      "documentation":"<p>The stages that an escalation plan or engagement plan engages contacts and contact methods in.</p>"
     },
     "Policy":{
       "type":"string",
@@ -2297,24 +1521,6 @@
       "min":1,
       "pattern":".*\\S.*"
     },
-    "PreviewOverride":{
-      "type":"structure",
-      "members":{
-        "NewMembers":{
-          "shape":"RotationOverridePreviewMemberList",
-          "documentation":"<p>Information about contacts to add to an on-call rotation override.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>Information about the time a rotation override would begin.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>Information about the time a rotation override would end.</p>"
-        }
-      },
-      "documentation":"<p>Information about contacts and times that an on-call override replaces.</p>"
-    },
     "PublicContent":{
       "type":"string",
       "max":8192,
@@ -2395,74 +1601,6 @@
       "type":"list",
       "member":{"shape":"Receipt"}
     },
-    "RecurrenceMultiplier":{
-      "type":"integer",
-      "max":100,
-      "min":1
-    },
-    "RecurrenceSettings":{
-      "type":"structure",
-      "required":[
-        "NumberOfOnCalls",
-        "RecurrenceMultiplier"
-      ],
-      "members":{
-        "MonthlySettings":{
-          "shape":"MonthlySettings",
-          "documentation":"<p>Information about on-call rotations that recur monthly.</p>"
-        },
-        "WeeklySettings":{
-          "shape":"WeeklySettings",
-          "documentation":"<p>Information about on-call rotations that recur weekly.</p>"
-        },
-        "DailySettings":{
-          "shape":"DailySettings",
-          "documentation":"<p>Information about on-call rotations that recur daily.</p>"
-        },
-        "NumberOfOnCalls":{
-          "shape":"NumberOfOnCalls",
-          "documentation":"<p>The number of contacts, or shift team members designated to be on call concurrently during a shift. For example, in an on-call schedule containing ten contacts, a value of <code>2</code> designates that two of them are on call at any given time.</p>",
-          "box":true
-        },
-        "ShiftCoverages":{
-          "shape":"ShiftCoveragesMap",
-          "documentation":"<p>Information about the days of the week included in on-call rotation coverage.</p>"
-        },
-        "RecurrenceMultiplier":{
-          "shape":"RecurrenceMultiplier",
-          "documentation":"<p>The number of days, weeks, or months a single rotation lasts.</p>",
-          "box":true
-        }
-      },
-      "documentation":"<p>Information about when an on-call rotation is in effect and how long the rotation period lasts.</p>"
-    },
-    "ResolutionContact":{
-      "type":"structure",
-      "required":[
-        "ContactArn",
-        "Type"
-      ],
-      "members":{
-        "ContactArn":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of a contact in the engagement resolution process. </p>"
-        },
-        "Type":{
-          "shape":"ContactType",
-          "documentation":"<p>The type of contact for a resolution step.</p>"
-        },
-        "StageIndex":{
-          "shape":"StageIndex",
-          "documentation":"<p>The stage in the escalation plan that resolves to this contact.</p>",
-          "box":true
-        }
-      },
-      "documentation":"<p>Information about the engagement resolution steps. The resolution starts from the first contact, which can be an escalation plan, then resolves to an on-call rotation, and finally to a personal contact.</p> <p>The <code>ResolutionContact</code> structure describes the information for each node or step in that process. It contains information about different contact types, such as the escalation, rotation, and personal contacts.</p>"
-    },
-    "ResolutionList":{
-      "type":"list",
-      "member":{"shape":"ResolutionContact"}
-    },
     "ResourceNotFoundException":{
       "type":"structure",
       "required":[
@@ -2491,145 +1629,6 @@
       "max":60,
       "min":0
     },
-    "Rotation":{
-      "type":"structure",
-      "required":[
-        "RotationArn",
-        "Name"
-      ],
-      "members":{
-        "RotationArn":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation.</p>"
-        },
-        "Name":{
-          "shape":"RotationName",
-          "documentation":"<p>The name of the rotation.</p>"
-        },
-        "ContactIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts assigned to the rotation team.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time the rotation becomes active.</p>"
-        },
-        "TimeZoneId":{
-          "shape":"TimeZoneId",
-          "documentation":"<p>The time zone the rotation’s activity is based on, in Internet Assigned Numbers Authority (IANA) format. For example: \"America/Los_Angeles\", \"UTC\", or \"Asia/Seoul\". </p>"
-        },
-        "Recurrence":{
-          "shape":"RecurrenceSettings",
-          "documentation":"<p>Information about when an on-call rotation is in effect and how long the rotation period lasts.</p>"
-        }
-      },
-      "documentation":"<p>Information about a rotation in an on-call schedule.</p>"
-    },
-    "RotationContactsArnList":{
-      "type":"list",
-      "member":{"shape":"SsmContactsArn"},
-      "max":30,
-      "min":1
-    },
-    "RotationName":{
-      "type":"string",
-      "max":255,
-      "min":1,
-      "pattern":"^[a-zA-Z0-9_\\-\\s\\.]*$"
-    },
-    "RotationOverride":{
-      "type":"structure",
-      "required":[
-        "RotationOverrideId",
-        "NewContactIds",
-        "StartTime",
-        "EndTime",
-        "CreateTime"
-      ],
-      "members":{
-        "RotationOverrideId":{
-          "shape":"Uuid",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the override to an on-call rotation.</p>"
-        },
-        "NewContactIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts assigned to the override of the on-call rotation.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The time a rotation override begins.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The time a rotation override ends.</p>"
-        },
-        "CreateTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The time a rotation override was created.</p>"
-        }
-      },
-      "documentation":"<p>Information about an override specified for an on-call rotation.</p>"
-    },
-    "RotationOverrideContactsArnList":{
-      "type":"list",
-      "member":{"shape":"SsmContactsArn"},
-      "max":30,
-      "min":0
-    },
-    "RotationOverridePreviewMemberList":{
-      "type":"list",
-      "member":{"shape":"Member"},
-      "max":30,
-      "min":0
-    },
-    "RotationOverrides":{
-      "type":"list",
-      "member":{"shape":"RotationOverride"}
-    },
-    "RotationPreviewMemberList":{
-      "type":"list",
-      "member":{"shape":"Member"},
-      "max":30,
-      "min":1
-    },
-    "RotationShift":{
-      "type":"structure",
-      "required":[
-        "StartTime",
-        "EndTime"
-      ],
-      "members":{
-        "ContactIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts who are part of the shift rotation. </p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The time a shift rotation begins.</p>"
-        },
-        "EndTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The time a shift rotation ends.</p>"
-        },
-        "Type":{
-          "shape":"ShiftType",
-          "documentation":"<p>The type of shift rotation.</p>"
-        },
-        "ShiftDetails":{
-          "shape":"ShiftDetails",
-          "documentation":"<p>Additional information about an on-call rotation shift.</p>"
-        }
-      },
-      "documentation":"<p>Information about a shift that belongs to an on-call rotation.</p>"
-    },
-    "RotationShifts":{
-      "type":"list",
-      "member":{"shape":"RotationShift"}
-    },
-    "Rotations":{
-      "type":"list",
-      "member":{"shape":"Rotation"}
-    },
     "SendActivationCodeRequest":{
       "type":"structure",
       "required":["ContactChannelId"],
@@ -2679,29 +1678,6 @@
       "documentation":"<p>Request would cause a service quota to be exceeded.</p>",
       "exception":true
     },
-    "ShiftCoveragesMap":{
-      "type":"map",
-      "key":{"shape":"DayOfWeek"},
-      "value":{"shape":"CoverageTimes"}
-    },
-    "ShiftDetails":{
-      "type":"structure",
-      "required":["OverriddenContactIds"],
-      "members":{
-        "OverriddenContactIds":{
-          "shape":"SsmContactsArnList",
-          "documentation":"<p>The Amazon Resources Names (ARNs) of the contacts who were replaced in a shift when an override was created. If the override is deleted, these contacts are restored to the shift.</p>"
-        }
-      },
-      "documentation":"<p>Information about overrides to an on-call rotation shift.</p>"
-    },
-    "ShiftType":{
-      "type":"string",
-      "enum":[
-        "REGULAR",
-        "OVERRIDDEN"
-      ]
-    },
     "SimpleAddress":{
       "type":"string",
       "max":320,
@@ -2713,12 +1689,6 @@
       "min":1,
       "pattern":"arn:(aws|aws-cn|aws-us-gov):ssm-contacts:[-\\w+=\\/,.@]*:[0-9]+:([\\w+=\\/,.@:-]+)*"
     },
-    "SsmContactsArnList":{
-      "type":"list",
-      "member":{"shape":"SsmContactsArn"},
-      "max":25,
-      "min":0
-    },
     "Stage":{
       "type":"structure",
       "required":[
@@ -2743,11 +1713,6 @@
       "max":30,
       "min":0
     },
-    "StageIndex":{
-      "type":"integer",
-      "max":100,
-      "min":0
-    },
     "StagesList":{
       "type":"list",
       "member":{"shape":"Stage"}
@@ -2816,7 +1781,7 @@
         },
         "Reason":{
           "shape":"StopReason",
-          "documentation":"<p>The reason that you're stopping the engagement.</p>"
+          "documentation":"<p>The reason that you're stopping the engagement. </p>"
         }
       }
     },
@@ -2950,12 +1915,6 @@
       },
       "documentation":"<p>A range of between two set times</p>"
     },
-    "TimeZoneId":{
-      "type":"string",
-      "max":255,
-      "min":1,
-      "pattern":"^[:a-zA-Z0-9_\\-\\s\\.\\\\/]*$"
-    },
     "UntagResourceRequest":{
       "type":"structure",
       "required":[
@@ -2992,7 +1951,7 @@
         },
         "DeliveryAddress":{
           "shape":"ContactChannelAddress",
-          "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel.</p>"
+          "documentation":"<p>The details that Incident Manager uses when trying to engage the contact channel. </p>"
         }
       }
     },
@@ -3015,7 +1974,7 @@
         },
         "Plan":{
           "shape":"Plan",
-          "documentation":"<p>A list of stages. A contact has an engagement plan with stages for specified contact channels. An escalation plan uses these stages to contact specified contacts.</p>"
+          "documentation":"<p>A list of stages. A contact has an engagement plan with stages for specified contact channels. An escalation plan uses these stages to contact specified contacts. </p>"
         }
       }
     },
@@ -3024,46 +1983,6 @@
       "members":{
       }
     },
-    "UpdateRotationRequest":{
-      "type":"structure",
-      "required":[
-        "RotationId",
-        "Recurrence"
-      ],
-      "members":{
-        "RotationId":{
-          "shape":"SsmContactsArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the rotation to update.</p>"
-        },
-        "ContactIds":{
-          "shape":"RotationContactsArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the contacts to include in the updated rotation. </p> <p>The order in which you list the contacts is their shift order in the rotation schedule.</p>"
-        },
-        "StartTime":{
-          "shape":"DateTime",
-          "documentation":"<p>The date and time the rotation goes into effect.</p>"
-        },
-        "TimeZoneId":{
-          "shape":"TimeZoneId",
-          "documentation":"<p>The time zone to base the updated rotation’s activity on, in Internet Assigned Numbers Authority (IANA) format. For example: \"America/Los_Angeles\", \"UTC\", or \"Asia/Seoul\". For more information, see the <a href=\"https://www.iana.org/time-zones\">Time Zone Database</a> on the IANA website.</p> <note> <p>Designators for time zones that don’t support Daylight Savings Time Rules, such as Pacific Standard Time (PST) and Pacific Daylight Time (PDT), aren't supported.</p> </note>"
-        },
-        "Recurrence":{
-          "shape":"RecurrenceSettings",
-          "documentation":"<p>Information about how long the updated rotation lasts before restarting at the beginning of the shift order.</p>"
-        }
-      }
-    },
-    "UpdateRotationResult":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "Uuid":{
-      "type":"string",
-      "max":39,
-      "min":36,
-      "pattern":"([a-fA-Z0-9]{8,11}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}){1}"
-    },
     "ValidationException":{
       "type":"structure",
       "required":["Message"],
@@ -3111,29 +2030,7 @@
         "FIELD_VALIDATION_FAILED",
         "OTHER"
       ]
-    },
-    "WeeklySetting":{
-      "type":"structure",
-      "required":[
-        "DayOfWeek",
-        "HandOffTime"
-      ],
-      "members":{
-        "DayOfWeek":{
-          "shape":"DayOfWeek",
-          "documentation":"<p>The day of the week when weekly recurring on-call shift rotations begins.</p>"
-        },
-        "HandOffTime":{
-          "shape":"HandOffTime",
-          "documentation":"<p>The time of day when a weekly recurring on-call shift rotation begins.</p>"
-        }
-      },
-      "documentation":"<p>Information about rotations that recur weekly.</p>"
-    },
-    "WeeklySettings":{
-      "type":"list",
-      "member":{"shape":"WeeklySetting"}
     }
   },
-  "documentation":"<p>Systems Manager Incident Manager is an incident management console designed to help users mitigate and recover from incidents affecting their Amazon Web Services-hosted applications. An incident is any unplanned interruption or reduction in quality of services.</p> <p>Incident Manager increases incident resolution by notifying responders of impact, highlighting relevant troubleshooting data, and providing collaboration tools to get services back up and running. To achieve the primary goal of reducing the time-to-resolution of critical incidents, Incident Manager automates response plans and enables responder team escalation.</p>"
+  "documentation":"<p>Systems Manager Incident Manager is an incident management console designed to help users mitigate and recover from incidents affecting their Amazon Web Services-hosted applications. An incident is any unplanned interruption or reduction in quality of services. </p> <p>Incident Manager increases incident resolution by notifying responders of impact, highlighting relevant troubleshooting data, and providing collaboration tools to get services back up and running. To achieve the primary goal of reducing the time-to-resolution of critical incidents, Incident Manager automates response plans and enables responder team escalation. </p>"
 }
diff --git a/awscli/botocore/data/ssm-incidents/2018-05-10/endpoint-rule-set-1.json b/awscli/botocore/data/ssm-incidents/2018-05-10/endpoint-rule-set-1.json
index 5f7f42b0b..575ce3d8c 100644
--- a/awscli/botocore/data/ssm-incidents/2018-05-10/endpoint-rule-set-1.json
+++ b/awscli/botocore/data/ssm-incidents/2018-05-10/endpoint-rule-set-1.json
@@ -32,12 +32,13 @@
         {
             "conditions": [
                 {
-                    "fn": "isSet",
+                    "fn": "aws.partition",
                     "argv": [
                         {
-                            "ref": "Endpoint"
+                            "ref": "Region"
                         }
-                    ]
+                    ],
+                    "assign": "PartitionResult"
                 }
             ],
             "type": "tree",
@@ -45,20 +46,23 @@
                 {
                     "conditions": [
                         {
-                            "fn": "booleanEquals",
+                            "fn": "isSet",
                             "argv": [
                                 {
-                                    "ref": "UseFIPS"
-                                },
-                                true
+                                    "ref": "Endpoint"
+                                }
                             ]
+                        },
+                        {
+                            "fn": "parseURL",
+                            "argv": [
+                                {
+                                    "ref": "Endpoint"
+                                }
+                            ],
+                            "assign": "url"
                         }
                     ],
-                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
                     "type": "tree",
                     "rules": [
                         {
@@ -67,42 +71,67 @@
                                     "fn": "booleanEquals",
                                     "argv": [
                                         {
-                                            "ref": "UseDualStack"
+                                            "ref": "UseFIPS"
                                         },
                                         true
                                     ]
                                 }
                             ],
-                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                            "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
                             "type": "error"
                         },
                         {
                             "conditions": [],
-                            "endpoint": {
-                                "url": {
-                                    "ref": "Endpoint"
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                                    "type": "error"
                                 },
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": {
+                                            "ref": "Endpoint"
+                                        },
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
                         }
                     ]
-                }
-            ]
-        },
-        {
-            "conditions": [],
-            "type": "tree",
-            "rules": [
+                },
                 {
                     "conditions": [
                         {
-                            "fn": "isSet",
+                            "fn": "booleanEquals",
                             "argv": [
                                 {
-                                    "ref": "Region"
-                                }
+                                    "ref": "UseFIPS"
+                                },
+                                true
+                            ]
+                        },
+                        {
+                            "fn": "booleanEquals",
+                            "argv": [
+                                {
+                                    "ref": "UseDualStack"
+                                },
+                                true
                             ]
                         }
                     ],
@@ -111,215 +140,90 @@
                         {
                             "conditions": [
                                 {
-                                    "fn": "aws.partition",
+                                    "fn": "booleanEquals",
                                     "argv": [
+                                        true,
                                         {
-                                            "ref": "Region"
-                                        }
-                                    ],
-                                    "assign": "PartitionResult"
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
-                                            ]
-                                        },
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseDualStack"
-                                                },
-                                                true
+                                                "supportsFIPS"
                                             ]
                                         }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://ssm-incidents-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": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseFIPS"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                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://ssm-incidents-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
+                                                "supportsDualStack"
                                             ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS is enabled but this partition does not support FIPS",
-                                            "type": "error"
                                         }
                                     ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://ssm-incidents-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": [
                                 {
-                                    "conditions": [
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        true,
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "getAttr",
                                             "argv": [
                                                 {
-                                                    "ref": "UseDualStack"
+                                                    "ref": "PartitionResult"
                                                 },
-                                                true
+                                                "supportsFIPS"
                                             ]
                                         }
-                                    ],
-                                    "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://ssm-incidents.{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": [],
                                     "type": "tree",
@@ -327,7 +231,7 @@
                                         {
                                             "conditions": [],
                                             "endpoint": {
-                                                "url": "https://ssm-incidents.{Region}.{PartitionResult#dnsSuffix}",
+                                                "url": "https://ssm-incidents-fips.{Region}.{PartitionResult#dnsSuffix}",
                                                 "properties": {},
                                                 "headers": {}
                                             },
@@ -336,13 +240,74 @@
                                     ]
                                 }
                             ]
+                        },
+                        {
+                            "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,
+                                        {
+                                            "fn": "getAttr",
+                                            "argv": [
+                                                {
+                                                    "ref": "PartitionResult"
+                                                },
+                                                "supportsDualStack"
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ],
+                            "type": "tree",
+                            "rules": [
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://ssm-incidents.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                }
+                            ]
+                        },
+                        {
+                            "conditions": [],
+                            "error": "DualStack is enabled but this partition does not support DualStack",
+                            "type": "error"
                         }
                     ]
                 },
                 {
                     "conditions": [],
-                    "error": "Invalid Configuration: Missing Region",
-                    "type": "error"
+                    "endpoint": {
+                        "url": "https://ssm-incidents.{Region}.{PartitionResult#dnsSuffix}",
+                        "properties": {},
+                        "headers": {}
+                    },
+                    "type": "endpoint"
                 }
             ]
         }
diff --git a/awscli/botocore/data/ssm-incidents/2018-05-10/service-2.json b/awscli/botocore/data/ssm-incidents/2018-05-10/service-2.json
index c20c94eeb..e4033dd2d 100644
--- a/awscli/botocore/data/ssm-incidents/2018-05-10/service-2.json
+++ b/awscli/botocore/data/ssm-incidents/2018-05-10/service-2.json
@@ -69,7 +69,7 @@
         {"shape":"ConflictException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Creates a custom timeline event on the incident details page of an incident record. Incident Manager automatically creates timeline events that mark key moments during an incident. You can create custom timeline events to mark important events that Incident Manager can detect automatically.</p>",
+      "documentation":"<p>Creates a custom timeline event on the incident details page of an incident record. Timeline events are automatically created by Incident Manager, marking key moment during an incident. You can create custom timeline events to mark important events that are automatically detected by Incident Manager.</p>",
       "idempotent":true
     },
     "DeleteIncidentRecord":{
@@ -805,7 +805,7 @@
       "members":{
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A token that ensures that a client calls the action only once with the specified details.</p>",
+          "documentation":"<p>A token ensuring that the action is called only once with the specified details.</p>",
           "idempotencyToken":true
         },
         "eventData":{
@@ -814,7 +814,7 @@
         },
         "eventReferences":{
           "shape":"EventReferenceList",
-          "documentation":"<p>Adds one or more references to the <code>TimelineEvent</code>. A reference is an Amazon Web Services resource involved or associated with the incident. To specify a reference, enter its Amazon Resource Name (ARN). You can also specify a related item associated with a resource. For example, to specify an Amazon DynamoDB (DynamoDB) table as a resource, use the table's ARN. You can also specify an Amazon CloudWatch metric associated with the DynamoDB table as a related item.</p>"
+          "documentation":"<p>Adds one or more references to the <code>TimelineEvent</code>. A reference can be an Amazon Web Services resource involved in the incident or in some way associated with it. When you specify a reference, you enter the Amazon Resource Name (ARN) of the resource. You can also specify a related item. As an example, you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table for this example is the resource. You could also specify a Amazon CloudWatch metric for that table. The metric is the related item.</p>"
         },
         "eventTime":{
           "shape":"Timestamp",
@@ -822,11 +822,11 @@
         },
         "eventType":{
           "shape":"TimelineEventType",
-          "documentation":"<p>The type of event. You can create timeline events of type <code>Custom Event</code>.</p>"
+          "documentation":"<p>The type of the event. You can create timeline events of type <code>Custom Event</code>.</p>"
         },
         "incidentRecordArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the incident record that the action adds the incident to.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the incident record to which the event will be added.</p>"
         }
       }
     },
@@ -941,7 +941,7 @@
       "members":{
         "eventId":{
           "shape":"UUID",
-          "documentation":"<p>The ID of the event to update. You can use <code>ListTimelineEvents</code> to find an event's ID.</p>"
+          "documentation":"<p>The ID of the event you are updating. You can find this by using <code>ListTimelineEvents</code>.</p>"
         },
         "incidentRecordArn":{
           "shape":"Arn",
@@ -1424,7 +1424,7 @@
     },
     "IncidentSummary":{
       "type":"string",
-      "max":8000,
+      "max":4000,
       "min":0
     },
     "IncidentTemplate":{
@@ -1564,7 +1564,7 @@
       "members":{
         "filters":{
           "shape":"FilterList",
-          "documentation":"<p>Filters the list of incident records you want to search through. You can filter on the following keys:</p> <ul> <li> <p> <code>creationTime</code> </p> </li> <li> <p> <code>impact</code> </p> </li> <li> <p> <code>status</code> </p> </li> <li> <p> <code>createdBy</code> </p> </li> </ul> <p>Note the following when when you use Filters:</p> <ul> <li> <p>If you don't specify a Filter, the response includes all incident records.</p> </li> <li> <p>If you specify more than one filter in a single request, the response returns incident records that match all filters.</p> </li> <li> <p>If you specify a filter with more than one value, the response returns incident records that match any of the values provided.</p> </li> </ul>"
+          "documentation":"<p>Filters the list of incident records through which you are searching. You can filter on the following keys:</p> <ul> <li> <p> <code>creationTime</code> </p> </li> <li> <p> <code>impact</code> </p> </li> <li> <p> <code>status</code> </p> </li> <li> <p> <code>createdBy</code> </p> </li> </ul> <p>Note the following when deciding how to use Filters:</p> <ul> <li> <p>If you don't specify a Filter, the response includes all incident records.</p> </li> <li> <p>If you specify more than one filter in a single request, the response returns incident records that match all filters.</p> </li> <li> <p>If you specify a filter with more than one value, the response returns incident records that match any of the values provided.</p> </li> </ul>"
         },
         "maxResults":{
           "shape":"MaxResults",
@@ -1704,7 +1704,7 @@
       "members":{
         "filters":{
           "shape":"FilterList",
-          "documentation":"<p>Filters the timeline events based on the provided conditional values. You can filter timeline events with the following keys:</p> <ul> <li> <p> <code>eventTime</code> </p> </li> <li> <p> <code>eventType</code> </p> </li> </ul> <p>Note the following when deciding how to use Filters:</p> <ul> <li> <p>If you don't specify a Filter, the response includes all timeline events.</p> </li> <li> <p>If you specify more than one filter in a single request, the response returns timeline events that match all filters.</p> </li> <li> <p>If you specify a filter with more than one value, the response returns timeline events that match any of the values provided.</p> </li> </ul>"
+          "documentation":"<p>Filters the timeline events based on the provided conditional values. You can filter timeline events using the following keys:</p> <ul> <li> <p> <code>eventTime</code> </p> </li> <li> <p> <code>eventType</code> </p> </li> </ul> <p>Note the following when deciding how to use Filters:</p> <ul> <li> <p>If you don't specify a Filter, the response includes all timeline events.</p> </li> <li> <p>If you specify more than one filter in a single request, the response returns timeline events that match all filters.</p> </li> <li> <p>If you specify a filter with more than one value, the response returns timeline events that match any of the values provided.</p> </li> </ul>"
         },
         "incidentRecordArn":{
           "shape":"Arn",
@@ -1720,7 +1720,7 @@
         },
         "sortBy":{
           "shape":"TimelineEventSort",
-          "documentation":"<p>Sort timeline events by the specified key value pair.</p>"
+          "documentation":"<p>Sort by the specified key value pair.</p>"
         },
         "sortOrder":{
           "shape":"SortOrder",
@@ -1892,7 +1892,7 @@
     },
     "RawData":{
       "type":"string",
-      "max":10000,
+      "max":4000,
       "min":0
     },
     "RegionInfo":{
@@ -2321,7 +2321,7 @@
         },
         "relatedItems":{
           "shape":"RelatedItemList",
-          "documentation":"<p>Add related items to the incident for other responders to use. Related items are Amazon Web Services resources, external links, or files uploaded to an Amazon S3 bucket. </p>"
+          "documentation":"<p>Add related items to the incident for other responders to use. Related items are AWS resources, external links, or files uploaded to an Amazon S3 bucket. </p>"
         },
         "responsePlanArn":{
           "shape":"Arn",
@@ -2590,20 +2590,20 @@
         },
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A token that ensures that a client calls the operation only once with the specified details.</p>",
+          "documentation":"<p>A token that ensures that the operation is called only once with the specified details.</p>",
           "idempotencyToken":true
         },
         "impact":{
           "shape":"Impact",
-          "documentation":"<p>Defines the impact of the incident to customers and applications. If you provide an impact for an incident, it overwrites the impact provided by the response plan.</p> <p class=\"title\"> <b>Possible impacts:</b> </p> <ul> <li> <p> <code>1</code> - Critical impact, full application failure that impacts many to all customers. </p> </li> <li> <p> <code>2</code> - High impact, partial application failure with impact to many customers.</p> </li> <li> <p> <code>3</code> - Medium impact, the application is providing reduced service to customers.</p> </li> <li> <p> <code>4</code> - Low impact, customer aren't impacted by the problem yet.</p> </li> <li> <p> <code>5</code> - No impact, customers aren't currently impacted but urgent action is needed to avoid impact.</p> </li> </ul>"
+          "documentation":"<p>Defines the impact of the incident to customers and applications. Providing an impact overwrites the impact provided by the response plan.</p> <p class=\"title\"> <b>Possible impacts:</b> </p> <ul> <li> <p> <code>1</code> - Critical impact, full application failure that impacts many to all customers. </p> </li> <li> <p> <code>2</code> - High impact, partial application failure with impact to many customers.</p> </li> <li> <p> <code>3</code> - Medium impact, the application is providing reduced service to customers.</p> </li> <li> <p> <code>4</code> - Low impact, customer aren't impacted by the problem yet.</p> </li> <li> <p> <code>5</code> - No impact, customers aren't currently impacted but urgent action is needed to avoid impact.</p> </li> </ul>"
         },
         "notificationTargets":{
           "shape":"NotificationTargetSet",
-          "documentation":"<p>The Amazon SNS targets that Incident Manager notifies when a client updates an incident.</p> <p>Using multiple SNS topics creates redundancy in the event that a Region is down during the incident.</p>"
+          "documentation":"<p>The Amazon SNS targets that are notified when updates are made to an incident.</p> <p>Using multiple SNS topics creates redundancy in the event that a Region is down during the incident.</p>"
         },
         "status":{
           "shape":"IncidentRecordStatus",
-          "documentation":"<p>The status of the incident. Possible statuses are <code>Open</code> or <code>Resolved</code>.</p>"
+          "documentation":"<p>The status of the incident. An incident can be <code>Open</code> or <code>Resolved</code>.</p>"
         },
         "summary":{
           "shape":"IncidentSummary",
@@ -2629,16 +2629,16 @@
       "members":{
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A token that ensures that a client calls the operation only once with the specified details.</p>",
+          "documentation":"<p>A token ensuring that the operation is called only once with the specified details.</p>",
           "idempotencyToken":true
         },
         "incidentRecordArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the incident record that contains the related items that you update.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the incident record containing the related items you are updating.</p>"
         },
         "relatedItemsUpdate":{
           "shape":"RelatedItemsUpdate",
-          "documentation":"<p>Details about the item that you are add to, or delete from, an incident.</p>"
+          "documentation":"<p>Details about the item you are adding or deleting.</p>"
         }
       }
     },
@@ -2768,7 +2768,7 @@
       "members":{
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A token that ensures that a client calls the operation only once with the specified details.</p>",
+          "documentation":"<p>A token ensuring that the operation is called only once with the specified details.</p>",
           "idempotencyToken":true
         },
         "eventData":{
@@ -2777,11 +2777,11 @@
         },
         "eventId":{
           "shape":"UUID",
-          "documentation":"<p>The ID of the event to update. You can use <code>ListTimelineEvents</code> to find an event's ID.</p>"
+          "documentation":"<p>The ID of the event you are updating. You can find this by using <code>ListTimelineEvents</code>.</p>"
         },
         "eventReferences":{
           "shape":"EventReferenceList",
-          "documentation":"<p>Updates all existing references in a <code>TimelineEvent</code>. A reference is an Amazon Web Services resource involved or associated with the incident. To specify a reference, enter its Amazon Resource Name (ARN). You can also specify a related item associated with that resource. For example, to specify an Amazon DynamoDB (DynamoDB) table as a resource, use its ARN. You can also specify an Amazon CloudWatch metric associated with the DynamoDB table as a related item.</p> <important> <p>This update action overrides all existing references. If you want to keep existing references, you must specify them in the call. If you don't, this action removes any existing references and enters only new references.</p> </important>"
+          "documentation":"<p>Updates all existing references in a <code>TimelineEvent</code>. A reference can be an Amazon Web Services resource involved in the incident or in some way associated with it. When you specify a reference, you enter the Amazon Resource Name (ARN) of the resource. You can also specify a related item. As an example, you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table for this example is the resource. You could also specify a Amazon CloudWatch metric for that table. The metric is the related item.</p> <important> <p>This update action overrides all existing references. If you want to keep existing references, you must specify them in the call. If you don't, this action removes them and enters only new references.</p> </important>"
         },
         "eventTime":{
           "shape":"Timestamp",
@@ -2789,7 +2789,7 @@
         },
         "eventType":{
           "shape":"TimelineEventType",
-          "documentation":"<p>The type of event. You can update events of type <code>Custom Event</code>.</p>"
+          "documentation":"<p>The type of the event. You can update events of type <code>Custom Event</code>.</p>"
         },
         "incidentRecordArn":{
           "shape":"Arn",
diff --git a/awscli/customizations/cloudformation/yamlhelper.py b/awscli/customizations/cloudformation/yamlhelper.py
index abdc7492f..2f460f928 100644
--- a/awscli/customizations/cloudformation/yamlhelper.py
+++ b/awscli/customizations/cloudformation/yamlhelper.py
@@ -63,21 +63,17 @@ def _dict_representer(dumper, data):
     return dumper.represent_dict(data.items())
 
 
-def _add_yaml_1_1_boolean_resolvers(resolver_cls):
-    # CloudFormation treats unquoted values that are YAML 1.1 native
-    # booleans as booleans, rather than strings. In YAML 1.2, the only
-    # boolean values are "true" and "false" so values such as "yes" and "no"
-    # when loaded as strings are not quoted when dumped. This logic ensures
-    # that we dump these values with quotes so that CloudFormation treats
-    # these values as strings and not booleans.
-    boolean_regex = re.compile(
-        '^(?:yes|Yes|YES|no|No|NO'
-        '|true|True|TRUE|false|False|FALSE'
-        '|on|On|ON|off|Off|OFF)$'
-    )
-    boolean_first_chars = list(u'yYnNtTfFoO')
-    resolver_cls.add_implicit_resolver(
-        'tag:yaml.org,2002:bool', boolean_regex, boolean_first_chars)
+def _str_representer(dumper, data):
+    # ruamel removes quotes from values that are unambiguously strings.
+    # Values like 0888888 can only be a string because integers can't
+    # have leading 0s and octals can't have the digits 8 and 9.
+    # However, CloudFormation treats these nonoctal values as integers
+    # and removes the leading 0s. This logic ensures that nonoctal
+    # values are quoted when dumped.
+    style = None
+    if re.match('^0[0-9]*[89][0-9]*$', data):
+        style = "'"
+    return dumper.represent_scalar('tag:yaml.org,2002:str', data, style=style)
 
 
 def yaml_dump(dict_to_dump):
@@ -88,10 +84,11 @@ def yaml_dump(dict_to_dump):
     """
 
     yaml = ruamel.yaml.YAML(typ="safe", pure=True)
+    yaml.version = (1, 1)
     yaml.default_flow_style = False
     yaml.Representer = FlattenAliasRepresenter
-    _add_yaml_1_1_boolean_resolvers(yaml.Resolver)
     yaml.Representer.add_representer(OrderedDict, _dict_representer)
+    yaml.Representer.add_representer(str, _str_representer)
 
     return dump_yaml_to_str(yaml, dict_to_dump)
 
@@ -111,12 +108,12 @@ def yaml_parse(yamlstr):
         return json.loads(yamlstr, object_pairs_hook=OrderedDict)
     except ValueError:
         yaml = ruamel.yaml.YAML(typ="safe", pure=True)
+        yaml.version = (1, 1)
         yaml.Constructor.add_constructor(
             ruamel.yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG,
             _dict_constructor)
         yaml.Constructor.add_multi_constructor(
             "!", intrinsics_multi_constructor)
-        _add_yaml_1_1_boolean_resolvers(yaml.Resolver)
 
         return yaml.load(yamlstr)
 
diff --git a/configure b/configure
index a9f3c7344..181818fc4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for awscli 2.11.7.
+# Generated by GNU Autoconf 2.71 for awscli 2.11.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='awscli'
 PACKAGE_TARNAME='awscli'
-PACKAGE_VERSION='2.11.7'
-PACKAGE_STRING='awscli 2.11.7'
+PACKAGE_VERSION='2.11.6'
+PACKAGE_STRING='awscli 2.11.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1255,7 +1255,7 @@ _ACEOF
 fi
 if $ac_init_version; then
   cat <<\_ACEOF
-awscli configure 2.11.7
+awscli configure 2.11.6
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1292,7 +1292,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by awscli $as_me 2.11.7, which was
+It was created by awscli $as_me 2.11.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2630,7 +2630,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by awscli $as_me 2.11.7, which was
+This file was extended by awscli $as_me 2.11.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2685,7 +2685,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-awscli config.status 2.11.7
+awscli config.status 2.11.6
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2677e46e4..8b11d24a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_CONFIG_MACRO_DIRS([m4])
-AC_INIT([awscli], [2.11.7])
+AC_INIT([awscli], [2.11.6])
 AC_CONFIG_SRCDIR([bin/aws])
 AM_PATH_PYTHON([3.8])
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1444e5ce4..6e2e853c8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -71,7 +71,7 @@ copyright = u'2018, Amazon Web Services'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.11.7'
+release = '2.11.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.


Test patch:
diff --git a/awscli/testutils.py b/awscli/testutils.py
index ab3a33ef7..588f27989 100644
--- a/awscli/testutils.py
+++ b/awscli/testutils.py
@@ -34,6 +34,7 @@ import math
 from pprint import pformat
 from subprocess import Popen, PIPE
 import unittest
+import re
 
 from awscli.compat import StringIO
 
@@ -58,6 +59,7 @@ from botocore.awsrequest import AWSResponse
 import awscli.clidriver
 from awscli.plugin import load_plugins
 from awscli.clidriver import CLIDriver
+from awscli.customizations.cloudformation.yamlhelper import yaml_dump
 
 
 _LOADER = botocore.loaders.Loader()
@@ -1012,3 +1014,8 @@ class ConsistencyWaiter(object):
     def _fail_message(self, attempts, successes):
         format_args = (attempts, successes)
         return 'Failed after %s attempts, only had %s successes' % format_args
+
+
+def yaml_dump_without_header(dict_to_dump):
+    dumped_yaml = yaml_dump(dict_to_dump)
+    return re.sub('%YAML 1.1\n---(\n| )', '', dumped_yaml)
diff --git a/tests/functional/botocore/endpoint-rules/iot-data/endpoint-tests-1.json b/tests/functional/botocore/endpoint-rules/iot-data/endpoint-tests-1.json
index 8c86d8891..ff50cb00a 100644
--- a/tests/functional/botocore/endpoint-rules/iot-data/endpoint-tests-1.json
+++ b/tests/functional/botocore/endpoint-rules/iot-data/endpoint-tests-1.json
@@ -1,519 +1,1247 @@
 {
     "testCases": [
         {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-south-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-south-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-south-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-south-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-south-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-south-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-south-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-south-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.us-gov-east-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-gov-east-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data.iot-fips.us-gov-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-gov-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-gov-east-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-gov-east-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-gov-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-gov-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.me-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "me-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.me-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "me-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.me-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "me-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.me-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "me-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ca-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ca-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data.iot-fips.ca-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ca-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ca-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ca-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ca-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ca-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.us-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data.iot-fips.us-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.us-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data.iot-fips.us-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-north-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-north-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-north-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-north-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-north-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-north-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-north-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-north-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-3.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-3",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-3.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-3",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-3.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-3",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-3.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-3",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.eu-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.eu-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-northeast-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-northeast-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-northeast-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-northeast-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-northeast-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-northeast-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-northeast-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-northeast-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-northeast-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-northeast-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.ap-northeast-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-northeast-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-northeast-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-northeast-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.ap-northeast-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-northeast-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-east-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.me-south-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-east-1"
+                "UseFIPS": true,
+                "Region": "me-south-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-northeast-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.me-south-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-northeast-1"
+                "UseFIPS": true,
+                "Region": "me-south-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-northeast-2.amazonaws.com"
+                    "url": "https://data-ats.iot.me-south-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-northeast-2"
+                "Region": "me-south-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-south-1.amazonaws.com"
+                    "url": "https://data-ats.iot.me-south-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-south-1"
+                "Region": "me-south-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-southeast-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.sa-east-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-southeast-1"
+                "UseFIPS": true,
+                "Region": "sa-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ap-southeast-2.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.sa-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "sa-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot.sa-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-southeast-2"
+                "Region": "sa-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.ca-central-1.amazonaws.com"
+                    "url": "https://data-ats.iot.sa-east-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ca-central-1"
+                "Region": "sa-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.ca-central-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.ap-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "ca-central-1"
+                "Region": "ap-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.eu-central-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.ap-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-central-1"
+                "UseFIPS": true,
+                "Region": "ap-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.eu-north-1.amazonaws.com"
+                    "url": "https://data-ats.iot.ap-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-north-1"
+                "Region": "ap-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.eu-west-1.amazonaws.com"
+                    "url": "https://data-ats.iot.ap-east-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-1"
+                "Region": "ap-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.eu-west-2.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-2"
+                "UseFIPS": true,
+                "Region": "cn-north-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.eu-west-3.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.cn-north-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-3"
+                "UseFIPS": true,
+                "Region": "cn-north-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.me-south-1.amazonaws.com"
+                    "url": "https://data-ats.iot.cn-north-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "me-south-1"
+                "Region": "cn-north-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.sa-east-1.amazonaws.com"
+                    "url": "https://data-ats.iot.cn-north-1.amazonaws.com.cn"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "sa-east-1"
+                "Region": "cn-north-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-east-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.us-gov-west-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-east-1"
+                "UseFIPS": true,
+                "Region": "us-gov-west-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-east-1.amazonaws.com"
+                    "url": "https://data.iot-fips.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-east-1"
+                "Region": "us-gov-west-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-east-2.amazonaws.com"
+                    "url": "https://data-ats.iot.us-gov-west-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-east-2"
+                "Region": "us-gov-west-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-east-2.amazonaws.com"
+                    "url": "https://data-ats.iot.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-east-2"
+                "UseFIPS": false,
+                "Region": "us-gov-west-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-west-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.ap-southeast-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-west-1"
+                "UseFIPS": true,
+                "Region": "ap-southeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-west-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.ap-southeast-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-west-1"
+                "Region": "ap-southeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-west-2.amazonaws.com"
+                    "url": "https://data-ats.iot.ap-southeast-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-west-2"
+                "Region": "ap-southeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-west-2.amazonaws.com"
+                    "url": "https://data-ats.iot.ap-southeast-1.amazonaws.com"
                 }
             },
             "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-west-2"
+                "UseFIPS": false,
+                "Region": "ap-southeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot-fips.us-east-1.api.aws"
+                    "url": "https://data-ats.iot-fips.ap-southeast-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-east-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-east-1.api.aws"
+                    "url": "https://data-ats.iot-fips.ap-southeast-2.amazonaws.com"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-east-1"
+                "UseFIPS": true,
+                "Region": "ap-southeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.ats.iot.cn-north-1.amazonaws.com.cn"
+                    "url": "https://data-ats.iot.ap-southeast-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "cn-north-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.cn-northwest-1.amazonaws.com.cn"
+                    "url": "https://data-ats.iot.ap-southeast-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "cn-northwest-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
-                "endpoint": {
-                    "url": "https://data-ats.iot-fips.cn-north-1.api.amazonwebservices.com.cn"
-                }
+                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "cn-north-1"
+                "Region": "us-iso-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot-fips.cn-north-1.amazonaws.com.cn"
+                    "url": "https://data-ats.iot-fips.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "cn-north-1"
+                "Region": "us-iso-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
+            "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": {
+                "UseFIPS": false,
+                "Region": "us-iso-east-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://data-ats.iot.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "cn-north-1"
+                "Region": "us-iso-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-gov-east-1.amazonaws.com"
+                    "url": "https://data-ats.iot-fips.us-east-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-gov-east-1"
+                "UseFIPS": true,
+                "Region": "us-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-gov-east-1.amazonaws.com"
+                    "url": "https://data.iot-fips.us-east-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-gov-east-1"
+                "Region": "us-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-gov-west-1.amazonaws.com"
+                    "url": "https://data-ats.iot.us-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-gov-west-1"
+                "Region": "us-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data.iot-fips.us-gov-west-1.amazonaws.com"
+                    "url": "https://data-ats.iot.us-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.us-east-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-gov-west-1"
+                "Region": "us-east-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot-fips.us-gov-east-1.api.aws"
+                    "url": "https://data.iot-fips.us-east-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-gov-east-1"
+                "Region": "us-east-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-gov-east-1.api.aws"
+                    "url": "https://data-ats.iot.us-east-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-gov-east-1"
+                "Region": "us-east-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
             "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
+                "endpoint": {
+                    "url": "https://data-ats.iot.us-east-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-east-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://data-ats.iot-fips.cn-northwest-1.api.amazonwebservices.com.cn"
+                }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-iso-east-1"
+                "Region": "cn-northwest-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot-fips.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://data-ats.iot-fips.cn-northwest-1.amazonaws.com.cn"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-iso-east-1"
+                "Region": "cn-northwest-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
             "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
+                "endpoint": {
+                    "url": "https://data-ats.iot.cn-northwest-1.api.amazonwebservices.com.cn"
+                }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-iso-east-1"
+                "Region": "cn-northwest-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://data-ats.iot.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://data-ats.iot.cn-northwest-1.amazonaws.com.cn"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-iso-east-1"
+                "Region": "cn-northwest-1",
+                "UseDualStack": false
             }
         },
         {
@@ -523,8 +1251,8 @@
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-isob-east-1"
+                "Region": "us-isob-east-1",
+                "UseDualStack": true
             }
         },
         {
@@ -536,8 +1264,8 @@
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-isob-east-1"
+                "Region": "us-isob-east-1",
+                "UseDualStack": false
             }
         },
         {
@@ -547,8 +1275,8 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-isob-east-1"
+                "Region": "us-isob-east-1",
+                "UseDualStack": true
             }
         },
         {
@@ -560,12 +1288,12 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-isob-east-1"
+                "Region": "us-isob-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
+            "documentation": "For custom endpoint with fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
                     "url": "https://example.com"
@@ -573,20 +1301,7 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
                 "Region": "us-east-1",
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://example.com"
-                }
-            },
-            "params": {
-                "UseFIPS": false,
                 "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
@@ -598,8 +1313,8 @@
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
                 "Region": "us-east-1",
+                "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -610,16 +1325,10 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
                 "Region": "us-east-1",
+                "UseDualStack": true,
                 "Endpoint": "https://example.com"
             }
-        },
-        {
-            "documentation": "Missing region",
-            "expect": {
-                "error": "Invalid Configuration: Missing Region"
-            }
         }
     ],
     "version": "1.0"
diff --git a/tests/functional/botocore/endpoint-rules/ssm-contacts/endpoint-tests-1.json b/tests/functional/botocore/endpoint-rules/ssm-contacts/endpoint-tests-1.json
index 739c38c65..c06ee1849 100644
--- a/tests/functional/botocore/endpoint-rules/ssm-contacts/endpoint-tests-1.json
+++ b/tests/functional/botocore/endpoint-rules/ssm-contacts/endpoint-tests-1.json
@@ -1,215 +1,7 @@
 {
     "testCases": [
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts-fips.us-east-1.api.aws"
-                }
-            },
-            "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://ssm-contacts-fips.us-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts.us-east-1.api.aws"
-                }
-            },
-            "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://ssm-contacts.us-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts-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://ssm-contacts-fips.cn-north-1.amazonaws.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://ssm-contacts.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://ssm-contacts.cn-north-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts-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://ssm-contacts-fips.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "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://ssm-contacts.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://ssm-contacts.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts-fips.us-iso-east-1.c2s.ic.gov"
-                }
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts.us-iso-east-1.c2s.ic.gov"
-                }
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts-fips.us-isob-east-1.sc2s.sgov.gov"
-                }
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseDualStack": false,
-                "UseFIPS": true
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://ssm-contacts.us-isob-east-1.sc2s.sgov.gov"
-                }
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseDualStack": false,
-                "UseFIPS": false
-            }
-        },
-        {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
+            "documentation": "For custom endpoint with fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
                     "url": "https://example.com"
@@ -222,19 +14,6 @@
                 "Endpoint": "https://example.com"
             }
         },
-        {
-            "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,
-                "Endpoint": "https://example.com"
-            }
-        },
         {
             "documentation": "For custom endpoint with fips enabled and dualstack disabled",
             "expect": {
diff --git a/tests/functional/botocore/endpoint-rules/ssm-incidents/endpoint-tests-1.json b/tests/functional/botocore/endpoint-rules/ssm-incidents/endpoint-tests-1.json
index de782db5e..9be57ba05 100644
--- a/tests/functional/botocore/endpoint-rules/ssm-incidents/endpoint-tests-1.json
+++ b/tests/functional/botocore/endpoint-rules/ssm-incidents/endpoint-tests-1.json
@@ -1,29 +1,42 @@
 {
     "testCases": [
         {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.ap-northeast-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.ap-south-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-northeast-1"
+                "UseFIPS": true,
+                "Region": "ap-south-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.ap-northeast-2.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.ap-south-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ap-south-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.ap-south-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-northeast-2"
+                "Region": "ap-south-1",
+                "UseDualStack": true
             }
         },
         {
@@ -35,34 +48,47 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-south-1"
+                "Region": "ap-south-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.ap-southeast-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.ca-central-1.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-southeast-1"
+                "UseFIPS": true,
+                "Region": "ca-central-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.ap-southeast-2.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.ca-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "ca-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.ca-central-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-southeast-2"
+                "Region": "ca-central-1",
+                "UseDualStack": true
             }
         },
         {
@@ -74,8 +100,47 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ca-central-1"
+                "Region": "ca-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.eu-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-central-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.eu-central-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.eu-central-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-central-1",
+                "UseDualStack": true
             }
         },
         {
@@ -87,8 +152,151 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-central-1"
+                "Region": "eu-central-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-west-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.eu-north-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-north-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.eu-north-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-north-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.eu-north-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "eu-north-1",
+                "UseDualStack": true
             }
         },
         {
@@ -100,34 +308,47 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-north-1"
+                "Region": "eu-north-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.eu-west-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.eu-west-3.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-1"
+                "UseFIPS": true,
+                "Region": "eu-west-3",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.eu-west-2.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.eu-west-3.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-3",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.eu-west-3.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-2"
+                "Region": "eu-west-3",
+                "UseDualStack": true
             }
         },
         {
@@ -139,330 +360,480 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-3"
+                "Region": "eu-west-3",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.sa-east-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.eu-west-2.api.aws"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "sa-east-1"
+                "UseFIPS": true,
+                "Region": "eu-west-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-east-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.eu-west-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.eu-west-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-east-1"
+                "Region": "eu-west-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-east-2.amazonaws.com"
+                    "url": "https://ssm-incidents.eu-west-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-east-2"
+                "Region": "eu-west-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-west-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.eu-west-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.eu-west-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "eu-west-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.eu-west-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-west-1"
+                "Region": "eu-west-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-west-2.amazonaws.com"
+                    "url": "https://ssm-incidents.eu-west-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-west-2"
+                "Region": "eu-west-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-east-1.api.aws"
+                    "url": "https://ssm-incidents-fips.ap-northeast-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-east-1"
+                "Region": "ap-northeast-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-east-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.ap-northeast-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-east-1"
+                "Region": "ap-northeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-east-1.api.aws"
+                    "url": "https://ssm-incidents.ap-northeast-2.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-east-1"
+                "Region": "ap-northeast-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.ap-northeast-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "ap-northeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://ssm-incidents-fips.ap-northeast-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "cn-north-1"
+                "Region": "ap-northeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.cn-north-1.amazonaws.com.cn"
+                    "url": "https://ssm-incidents-fips.ap-northeast-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "cn-north-1"
+                "Region": "ap-northeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://ssm-incidents.ap-northeast-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "cn-north-1"
+                "Region": "ap-northeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.cn-north-1.amazonaws.com.cn"
+                    "url": "https://ssm-incidents.ap-northeast-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "cn-north-1"
+                "Region": "ap-northeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-gov-east-1.api.aws"
+                    "url": "https://ssm-incidents-fips.sa-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-gov-east-1"
+                "Region": "sa-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-gov-east-1.amazonaws.com"
+                    "url": "https://ssm-incidents-fips.sa-east-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-gov-east-1"
+                "Region": "sa-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-gov-east-1.api.aws"
+                    "url": "https://ssm-incidents.sa-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-gov-east-1"
+                "Region": "sa-east-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-gov-east-1.amazonaws.com"
+                    "url": "https://ssm-incidents.sa-east-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-gov-east-1"
+                "Region": "sa-east-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled",
             "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.ap-southeast-1.api.aws"
+                }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-iso-east-1"
+                "Region": "ap-southeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://ssm-incidents-fips.ap-southeast-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-iso-east-1"
+                "Region": "ap-southeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled",
             "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
+                "endpoint": {
+                    "url": "https://ssm-incidents.ap-southeast-1.api.aws"
+                }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-iso-east-1"
+                "Region": "ap-southeast-1",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://ssm-incidents.ap-southeast-1.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-iso-east-1"
+                "Region": "ap-southeast-1",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled",
             "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.ap-southeast-2.api.aws"
+                }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-isob-east-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents-fips.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://ssm-incidents-fips.ap-southeast-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-isob-east-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled",
             "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
+                "endpoint": {
+                    "url": "https://ssm-incidents.ap-southeast-2.api.aws"
+                }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-isob-east-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://ssm-incidents.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://ssm-incidents.ap-southeast-2.amazonaws.com"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-isob-east-1"
+                "Region": "ap-southeast-2",
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://example.com"
+                    "url": "https://ssm-incidents-fips.us-east-1.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-east-1",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-east-1.api.aws"
                 }
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": false,
                 "Region": "us-east-1",
-                "Endpoint": "https://example.com"
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-east-1.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-east-1",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-east-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-east-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents-fips.us-east-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": true,
+                "Region": "us-east-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-east-2.api.aws"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-east-2",
+                "UseDualStack": true
+            }
+        },
+        {
+            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "expect": {
+                "endpoint": {
+                    "url": "https://ssm-incidents.us-east-2.amazonaws.com"
+                }
+            },
+            "params": {
+                "UseFIPS": false,
+                "Region": "us-east-2",
+                "UseDualStack": false
+            }
+        },
+        {
+            "documentation": "For custom endpoint with fips disabled and dualstack disabled",
             "expect": {
                 "endpoint": {
                     "url": "https://example.com"
@@ -470,6 +841,7 @@
             },
             "params": {
                 "UseFIPS": false,
+                "Region": "us-east-1",
                 "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
@@ -481,8 +853,8 @@
             },
             "params": {
                 "UseFIPS": true,
-                "UseDualStack": false,
                 "Region": "us-east-1",
+                "UseDualStack": false,
                 "Endpoint": "https://example.com"
             }
         },
@@ -493,16 +865,10 @@
             },
             "params": {
                 "UseFIPS": false,
-                "UseDualStack": true,
                 "Region": "us-east-1",
+                "UseDualStack": true,
                 "Endpoint": "https://example.com"
             }
-        },
-        {
-            "documentation": "Missing region",
-            "expect": {
-                "error": "Invalid Configuration: Missing Region"
-            }
         }
     ],
     "version": "1.0"
diff --git a/tests/functional/cloudformation/test_package.py b/tests/functional/cloudformation/test_package.py
index a7b0af9e1..2dd09a6a3 100644
--- a/tests/functional/cloudformation/test_package.py
+++ b/tests/functional/cloudformation/test_package.py
@@ -23,7 +23,7 @@ from unittest import TestCase
 from awscli.customizations.cloudformation.artifact_exporter import make_zip
 from awscli.customizations.cloudformation.yamlhelper import yaml_dump
 from awscli.customizations.cloudformation.artifact_exporter import Template
-from awscli.testutils import skip_if_windows
+from awscli.testutils import yaml_dump_without_header, skip_if_windows
 
 
 class TestPackageZipFiles(TestCase):
@@ -87,7 +87,7 @@ def _generate_template_cases():
 def test_known_templates(input_template, output_template):
     template = Template(input_template, os.getcwd(), None)
     exported = template.export()
-    result = yaml_dump(exported)
+    result = yaml_dump_without_header(exported)
     expected = open(output_template, 'r').read()
 
     assert result == expected, (
diff --git a/tests/unit/customizations/cloudformation/test_yamlhelper.py b/tests/unit/customizations/cloudformation/test_yamlhelper.py
index 9f511b0e7..c0e4c0f98 100644
--- a/tests/unit/customizations/cloudformation/test_yamlhelper.py
+++ b/tests/unit/customizations/cloudformation/test_yamlhelper.py
@@ -20,6 +20,7 @@ from botocore.compat import OrderedDict
 from awscli.customizations.cloudformation.deployer import Deployer
 from awscli.customizations.cloudformation.yamlhelper import yaml_parse, yaml_dump
 from tests.unit.customizations.cloudformation import BaseYAMLTest
+from awscli.testutils import yaml_dump_without_header
 
 
 class TestYaml(BaseYAMLTest):
@@ -145,7 +146,7 @@ class TestYaml(BaseYAMLTest):
         ])
         self.assertEqual(expected_dict, output_dict)
 
-        output_template = yaml_dump(output_dict)
+        output_template = yaml_dump_without_header(output_dict)
         self.assertEqual(input_template, output_template)
 
     def test_yaml_merge_tag(self):
@@ -182,7 +183,7 @@ class TestYaml(BaseYAMLTest):
             '      Foo: bar\n'
             '      Spam: eggs\n'
         )
-        actual = yaml_dump(template)
+        actual = yaml_dump_without_header(template)
         self.assertEqual(actual, expected)
 
     def test_yaml_dump_quotes_boolean_strings(self):
@@ -193,4 +194,26 @@ class TestYaml(BaseYAMLTest):
         ]
         for bool_as_string in bools_as_strings:
             self.assertEqual(
-                yaml_dump(bool_as_string), "'%s'\n" % bool_as_string)
+                yaml_dump_without_header(bool_as_string),
+                "'%s'\n" % bool_as_string)
+
+    def test_yaml_dump_quotes_octal_strings(self):
+        octals_as_strings = [
+            '01111111', '02222222', '03333333',
+            '04444444', '05555555', '06666666',
+            '07777777', '08888888', '09999999'
+        ]
+        for octal_as_string in octals_as_strings:
+            self.assertEqual(
+                yaml_dump_without_header(octal_as_string),
+                "'%s'\n" % octal_as_string)
+
+    def test_yaml_dump_include_1_1_header(self):
+        template = {"Resources": {"Foo": "Bar"}}
+        expected = (
+            '%YAML 1.1\n---\n'
+            'Resources:\n'
+            '  Foo: Bar\n'
+        )
+        actual = yaml_dump(template)
+        self.assertEqual(actual, expected)
diff --git a/tests/unit/test_clidriver.py b/tests/unit/test_clidriver.py
index c92ae506f..c317f0932 100644
--- a/tests/unit/test_clidriver.py
+++ b/tests/unit/test_clidriver.py
@@ -749,9 +749,7 @@ class TestAWSCommand(BaseAWSCommandParamsTest):
         self.assertIn(HELP_BLURB, self.stderr.getvalue())
 
     def test_help_blurb_in_unknown_argument_error_message(self):
-        args = ['s3api', 'list-objects', '--help']
-        driver = create_clidriver(args)
-        rc = driver.main(args)
+        rc = self.driver.main(['s3api', 'list-objects', '--help'])
         self.assertEqual(rc, 252)
         self.assertIn(HELP_BLURB, self.stderr.getvalue())