diff --git a/VERSION b/VERSION
index 188f5ebf4cc..c624785cc27 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.199
\ No newline at end of file
+1.11.200
\ No newline at end of file
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerClient.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerClient.h
index 4326134c851..c0ce520b019 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerClient.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerClient.h
@@ -18,11 +18,12 @@ namespace ControlTower
   /**
    * <p>These interfaces allow you to apply the AWS library of pre-defined
    * <i>controls</i> to your organizational units, programmatically. In AWS Control
-   * Tower, the terms "control" and "guardrail" are synonyms. .</p> <p>To call these
+   * Tower, the terms "control" and "guardrail" are synonyms.</p> <p>To call these
    * APIs, you'll need to know:</p> <ul> <li> <p>the <code>controlIdentifier</code>
    * for the control--or guardrail--you are targeting.</p> </li> <li> <p>the ARN
    * associated with the target organizational unit (OU), which we call the
-   * <code>targetIdentifier</code>.</p> </li> </ul> <p> <b>To get the
+   * <code>targetIdentifier</code>.</p> </li> <li> <p>the ARN associated with a
+   * resource that you wish to tag or untag.</p> </li> </ul> <p> <b>To get the
    * <code>controlIdentifier</code> for your AWS Control Tower control:</b> </p>
    * <p>The <code>controlIdentifier</code> is an ARN that is specified for each
    * control. You can view the <code>controlIdentifier</code> in the console on the
@@ -35,7 +36,7 @@ namespace ControlTower
    * quick-reference list of control identifers for the AWS Control Tower legacy
    * <i>Strongly recommended</i> and <i>Elective</i> controls is given in <a
    * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html.html">Resource
-   * identifiers for APIs and guardrails</a> in the <a
+   * identifiers for APIs and controls</a> in the <a
    * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html">Controls
    * reference guide section</a> of the <i>AWS Control Tower User Guide</i>. Remember
    * that <i>Mandatory</i> controls cannot be added or removed.</p>  <p> <b>ARN
@@ -170,7 +171,7 @@ namespace ControlTower
          * contains. The resources created will vary according to the control that you
          * specify. For usage examples, see <a
          * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
-         * <i>the AWS Control Tower User Guide</i> </a> </p><p><h3>See Also:</h3>   <a
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/EnableControl">AWS
          * API Reference</a></p>
          */
@@ -199,7 +200,7 @@ namespace ControlTower
          * <code>DisableControl</code> operation. Displays a message in case of error.
          * Details for an operation are available for 90 days. For usage examples, see <a
          * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
-         * <i>the AWS Control Tower User Guide</i> </a> </p><p><h3>See Also:</h3>   <a
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/GetControlOperation">AWS
          * API Reference</a></p>
          */
@@ -224,14 +225,9 @@ namespace ControlTower
         }
 
         /**
-         * <p> Provides details about the enabled control. For usage examples, see <a
+         * <p>Retrieves details about an enabled control. For usage examples, see <a
          * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
-         * <i>the AWS Control Tower User Guide</i> </a>.</p> <p class="title"> <b>Returned
-         * values</b> </p> <ul> <li> <p>TargetRegions: Shows target AWS Regions where the
-         * enabled control is available to be deployed.</p> </li> <li> <p>StatusSummary:
-         * Provides a detailed summary of the deployment status.</p> </li> <li>
-         * <p>DriftSummary: Provides a detailed summary of the drifted status.</p> </li>
-         * </ul><p><h3>See Also:</h3>   <a
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/GetEnabledControl">AWS
          * API Reference</a></p>
          */
@@ -259,7 +255,7 @@ namespace ControlTower
          * <p>Lists the controls enabled by AWS Control Tower on the specified
          * organizational unit and the accounts it contains. For usage examples, see <a
          * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
-         * <i>the AWS Control Tower User Guide</i> </a> </p><p><h3>See Also:</h3>   <a
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/ListEnabledControls">AWS
          * API Reference</a></p>
          */
@@ -283,6 +279,88 @@ namespace ControlTower
             return SubmitAsync(&ControlTowerClient::ListEnabledControls, request, handler, context);
         }
 
+        /**
+         * <p>Returns a list of tags associated with the resource. For usage examples, see
+         * <a
+         * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/ListTagsForResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListTagsForResourceOutcome ListTagsForResource(const Model::ListTagsForResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for ListTagsForResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename ListTagsForResourceRequestT = Model::ListTagsForResourceRequest>
+        Model::ListTagsForResourceOutcomeCallable ListTagsForResourceCallable(const ListTagsForResourceRequestT& request) const
+        {
+            return SubmitCallable(&ControlTowerClient::ListTagsForResource, request);
+        }
+
+        /**
+         * An Async wrapper for ListTagsForResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename ListTagsForResourceRequestT = Model::ListTagsForResourceRequest>
+        void ListTagsForResourceAsync(const ListTagsForResourceRequestT& request, const ListTagsForResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ControlTowerClient::ListTagsForResource, request, handler, context);
+        }
+
+        /**
+         * <p>Applies tags to a resource. For usage examples, see <a
+         * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/TagResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::TagResourceOutcome TagResource(const Model::TagResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for TagResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename TagResourceRequestT = Model::TagResourceRequest>
+        Model::TagResourceOutcomeCallable TagResourceCallable(const TagResourceRequestT& request) const
+        {
+            return SubmitCallable(&ControlTowerClient::TagResource, request);
+        }
+
+        /**
+         * An Async wrapper for TagResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename TagResourceRequestT = Model::TagResourceRequest>
+        void TagResourceAsync(const TagResourceRequestT& request, const TagResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ControlTowerClient::TagResource, request, handler, context);
+        }
+
+        /**
+         * <p>Removes tags from a resource. For usage examples, see <a
+         * href="https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html">
+         * <i>the AWS Control Tower User Guide</i> </a>.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/UntagResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UntagResourceOutcome UntagResource(const Model::UntagResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for UntagResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UntagResourceRequestT = Model::UntagResourceRequest>
+        Model::UntagResourceOutcomeCallable UntagResourceCallable(const UntagResourceRequestT& request) const
+        {
+            return SubmitCallable(&ControlTowerClient::UntagResource, request);
+        }
+
+        /**
+         * An Async wrapper for UntagResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UntagResourceRequestT = Model::UntagResourceRequest>
+        void UntagResourceAsync(const UntagResourceRequestT& request, const UntagResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ControlTowerClient::UntagResource, request, handler, context);
+        }
+
 
       void OverrideEndpoint(const Aws::String& endpoint);
       std::shared_ptr<ControlTowerEndpointProviderBase>& accessEndpointProvider();
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerServiceClientModel.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerServiceClientModel.h
index fe9bf6c4fc4..882d73a05cd 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/ControlTowerServiceClientModel.h
@@ -23,6 +23,9 @@
 #include <aws/controltower/model/GetControlOperationResult.h>
 #include <aws/controltower/model/GetEnabledControlResult.h>
 #include <aws/controltower/model/ListEnabledControlsResult.h>
+#include <aws/controltower/model/ListTagsForResourceResult.h>
+#include <aws/controltower/model/TagResourceResult.h>
+#include <aws/controltower/model/UntagResourceResult.h>
 /* End of service model headers required in ControlTowerClient header */
 
 namespace Aws
@@ -68,6 +71,9 @@ namespace Aws
       class GetControlOperationRequest;
       class GetEnabledControlRequest;
       class ListEnabledControlsRequest;
+      class ListTagsForResourceRequest;
+      class TagResourceRequest;
+      class UntagResourceRequest;
       /* End of service model forward declarations required in ControlTowerClient header */
 
       /* Service model Outcome class definitions */
@@ -76,6 +82,9 @@ namespace Aws
       typedef Aws::Utils::Outcome<GetControlOperationResult, ControlTowerError> GetControlOperationOutcome;
       typedef Aws::Utils::Outcome<GetEnabledControlResult, ControlTowerError> GetEnabledControlOutcome;
       typedef Aws::Utils::Outcome<ListEnabledControlsResult, ControlTowerError> ListEnabledControlsOutcome;
+      typedef Aws::Utils::Outcome<ListTagsForResourceResult, ControlTowerError> ListTagsForResourceOutcome;
+      typedef Aws::Utils::Outcome<TagResourceResult, ControlTowerError> TagResourceOutcome;
+      typedef Aws::Utils::Outcome<UntagResourceResult, ControlTowerError> UntagResourceOutcome;
       /* End of service model Outcome class definitions */
 
       /* Service model Outcome callable definitions */
@@ -84,6 +93,9 @@ namespace Aws
       typedef std::future<GetControlOperationOutcome> GetControlOperationOutcomeCallable;
       typedef std::future<GetEnabledControlOutcome> GetEnabledControlOutcomeCallable;
       typedef std::future<ListEnabledControlsOutcome> ListEnabledControlsOutcomeCallable;
+      typedef std::future<ListTagsForResourceOutcome> ListTagsForResourceOutcomeCallable;
+      typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
+      typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
       /* End of service model Outcome callable definitions */
     } // namespace Model
 
@@ -95,6 +107,9 @@ namespace Aws
     typedef std::function<void(const ControlTowerClient*, const Model::GetControlOperationRequest&, const Model::GetControlOperationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetControlOperationResponseReceivedHandler;
     typedef std::function<void(const ControlTowerClient*, const Model::GetEnabledControlRequest&, const Model::GetEnabledControlOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetEnabledControlResponseReceivedHandler;
     typedef std::function<void(const ControlTowerClient*, const Model::ListEnabledControlsRequest&, const Model::ListEnabledControlsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListEnabledControlsResponseReceivedHandler;
+    typedef std::function<void(const ControlTowerClient*, const Model::ListTagsForResourceRequest&, const Model::ListTagsForResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListTagsForResourceResponseReceivedHandler;
+    typedef std::function<void(const ControlTowerClient*, const Model::TagResourceRequest&, const Model::TagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TagResourceResponseReceivedHandler;
+    typedef std::function<void(const ControlTowerClient*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
     /* End of service model async handlers definitions */
   } // namespace ControlTower
 } // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlRequest.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlRequest.h
index d3793a8aa82..be4db175335 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlRequest.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlRequest.h
@@ -7,6 +7,7 @@
 #include <aws/controltower/ControlTower_EXPORTS.h>
 #include <aws/controltower/ControlTowerRequest.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSMap.h>
 #include <utility>
 
 namespace Aws
@@ -105,6 +106,72 @@ namespace Model
     inline EnableControlRequest& WithControlIdentifier(const char* value) { SetControlIdentifier(value); return *this;}
 
 
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline const Aws::Map<Aws::String, Aws::String>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline void SetTags(const Aws::Map<Aws::String, Aws::String>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline void SetTags(Aws::Map<Aws::String, Aws::String>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& WithTags(const Aws::Map<Aws::String, Aws::String>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& WithTags(Aws::Map<Aws::String, Aws::String>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(const Aws::String& key, const Aws::String& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(Aws::String&& key, const Aws::String& value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(const Aws::String& key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(Aws::String&& key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(const char* key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(Aws::String&& key, const char* value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlRequest& AddTags(const char* key, const char* value) { m_tagsHasBeenSet = true; m_tags.emplace(key, value); return *this; }
+
+
     /**
      * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
@@ -174,6 +241,9 @@ namespace Model
     Aws::String m_controlIdentifier;
     bool m_controlIdentifierHasBeenSet = false;
 
+    Aws::Map<Aws::String, Aws::String> m_tags;
+    bool m_tagsHasBeenSet = false;
+
     Aws::String m_targetIdentifier;
     bool m_targetIdentifierHasBeenSet = false;
   };
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlResult.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlResult.h
index 680c8f482bb..109566d5f20 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlResult.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnableControlResult.h
@@ -32,6 +32,42 @@ namespace Model
     AWS_CONTROLTOWER_API EnableControlResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline const Aws::String& GetArn() const{ return m_arn; }
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline void SetArn(const Aws::String& value) { m_arn = value; }
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline void SetArn(Aws::String&& value) { m_arn = std::move(value); }
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline void SetArn(const char* value) { m_arn.assign(value); }
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlResult& WithArn(const Aws::String& value) { SetArn(value); return *this;}
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlResult& WithArn(Aws::String&& value) { SetArn(std::move(value)); return *this;}
+
+    /**
+     * <p>The ARN of the <code>EnabledControl</code> resource.</p>
+     */
+    inline EnableControlResult& WithArn(const char* value) { SetArn(value); return *this;}
+
+
     /**
      * <p>The ID of the asynchronous operation, which is used to track status. The
      * operation is available for 90 days.</p>
@@ -98,6 +134,8 @@ namespace Model
 
   private:
 
+    Aws::String m_arn;
+
     Aws::String m_operationIdentifier;
 
     Aws::String m_requestId;
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlDetails.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlDetails.h
index 25e7f6861dc..7e00d87bd5c 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlDetails.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlDetails.h
@@ -28,7 +28,7 @@ namespace Model
 {
 
   /**
-   * <p> Information about the enabled control. </p><p><h3>See Also:</h3>   <a
+   * <p>Information about the enabled control.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/EnabledControlDetails">AWS
    * API Reference</a></p>
    */
@@ -42,275 +42,275 @@ namespace Model
 
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline const Aws::String& GetArn() const{ return m_arn; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline bool ArnHasBeenSet() const { return m_arnHasBeenSet; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(const Aws::String& value) { m_arnHasBeenSet = true; m_arn = value; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(Aws::String&& value) { m_arnHasBeenSet = true; m_arn = std::move(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(const char* value) { m_arnHasBeenSet = true; m_arn.assign(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlDetails& WithArn(const Aws::String& value) { SetArn(value); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlDetails& WithArn(Aws::String&& value) { SetArn(std::move(value)); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlDetails& WithArn(const char* value) { SetArn(value); return *this;}
 
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline const Aws::String& GetControlIdentifier() const{ return m_controlIdentifier; }
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline bool ControlIdentifierHasBeenSet() const { return m_controlIdentifierHasBeenSet; }
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetControlIdentifier(const Aws::String& value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier = value; }
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetControlIdentifier(Aws::String&& value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier = std::move(value); }
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetControlIdentifier(const char* value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier.assign(value); }
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithControlIdentifier(const Aws::String& value) { SetControlIdentifier(value); return *this;}
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithControlIdentifier(Aws::String&& value) { SetControlIdentifier(std::move(value)); return *this;}
 
     /**
-     * <p> The control identifier of the enabled control. For information on how to
-     * find the <code>controlIdentifier</code>, see <a
+     * <p>The control identifier of the enabled control. For information on how to find
+     * the <code>controlIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithControlIdentifier(const char* value) { SetControlIdentifier(value); return *this;}
 
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline const DriftStatusSummary& GetDriftStatusSummary() const{ return m_driftStatusSummary; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline bool DriftStatusSummaryHasBeenSet() const { return m_driftStatusSummaryHasBeenSet; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline void SetDriftStatusSummary(const DriftStatusSummary& value) { m_driftStatusSummaryHasBeenSet = true; m_driftStatusSummary = value; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline void SetDriftStatusSummary(DriftStatusSummary&& value) { m_driftStatusSummaryHasBeenSet = true; m_driftStatusSummary = std::move(value); }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline EnabledControlDetails& WithDriftStatusSummary(const DriftStatusSummary& value) { SetDriftStatusSummary(value); return *this;}
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline EnabledControlDetails& WithDriftStatusSummary(DriftStatusSummary&& value) { SetDriftStatusSummary(std::move(value)); return *this;}
 
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline const EnablementStatusSummary& GetStatusSummary() const{ return m_statusSummary; }
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline bool StatusSummaryHasBeenSet() const { return m_statusSummaryHasBeenSet; }
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline void SetStatusSummary(const EnablementStatusSummary& value) { m_statusSummaryHasBeenSet = true; m_statusSummary = value; }
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline void SetStatusSummary(EnablementStatusSummary&& value) { m_statusSummaryHasBeenSet = true; m_statusSummary = std::move(value); }
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline EnabledControlDetails& WithStatusSummary(const EnablementStatusSummary& value) { SetStatusSummary(value); return *this;}
 
     /**
-     * <p> The deployment summary of the enabled control. </p>
+     * <p>The deployment summary of the enabled control.</p>
      */
     inline EnabledControlDetails& WithStatusSummary(EnablementStatusSummary&& value) { SetStatusSummary(std::move(value)); return *this;}
 
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline const Aws::String& GetTargetIdentifier() const{ return m_targetIdentifier; }
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline bool TargetIdentifierHasBeenSet() const { return m_targetIdentifierHasBeenSet; }
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetTargetIdentifier(const Aws::String& value) { m_targetIdentifierHasBeenSet = true; m_targetIdentifier = value; }
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetTargetIdentifier(Aws::String&& value) { m_targetIdentifierHasBeenSet = true; m_targetIdentifier = std::move(value); }
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline void SetTargetIdentifier(const char* value) { m_targetIdentifierHasBeenSet = true; m_targetIdentifier.assign(value); }
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithTargetIdentifier(const Aws::String& value) { SetTargetIdentifier(value); return *this;}
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithTargetIdentifier(Aws::String&& value) { SetTargetIdentifier(std::move(value)); return *this;}
 
     /**
-     * <p> The ARN of the organizational unit. For information on how to find the
+     * <p>The ARN of the organizational unit. For information on how to find the
      * <code>targetIdentifier</code>, see <a
      * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>. </p>
+     * overview page</a>.</p>
      */
     inline EnabledControlDetails& WithTargetIdentifier(const char* value) { SetTargetIdentifier(value); return *this;}
 
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline const Aws::Vector<Region>& GetTargetRegions() const{ return m_targetRegions; }
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline bool TargetRegionsHasBeenSet() const { return m_targetRegionsHasBeenSet; }
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline void SetTargetRegions(const Aws::Vector<Region>& value) { m_targetRegionsHasBeenSet = true; m_targetRegions = value; }
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline void SetTargetRegions(Aws::Vector<Region>&& value) { m_targetRegionsHasBeenSet = true; m_targetRegions = std::move(value); }
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline EnabledControlDetails& WithTargetRegions(const Aws::Vector<Region>& value) { SetTargetRegions(value); return *this;}
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline EnabledControlDetails& WithTargetRegions(Aws::Vector<Region>&& value) { SetTargetRegions(std::move(value)); return *this;}
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline EnabledControlDetails& AddTargetRegions(const Region& value) { m_targetRegionsHasBeenSet = true; m_targetRegions.push_back(value); return *this; }
 
     /**
-     * <p> Target AWS Regions for the enabled control. </p>
+     * <p>Target AWS Regions for the enabled control.</p>
      */
     inline EnabledControlDetails& AddTargetRegions(Region&& value) { m_targetRegionsHasBeenSet = true; m_targetRegions.push_back(std::move(value)); return *this; }
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlSummary.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlSummary.h
index c2af9bdbaf8..50a9f373d4b 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlSummary.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnabledControlSummary.h
@@ -26,7 +26,8 @@ namespace Model
 {
 
   /**
-   * <p>A summary of enabled controls.</p><p><h3>See Also:</h3>   <a
+   * <p>Returns a summary of information about an enabled control.</p><p><h3>See
+   * Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/EnabledControlSummary">AWS
    * API Reference</a></p>
    */
@@ -40,177 +41,145 @@ namespace Model
 
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline const Aws::String& GetArn() const{ return m_arn; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline bool ArnHasBeenSet() const { return m_arnHasBeenSet; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(const Aws::String& value) { m_arnHasBeenSet = true; m_arn = value; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(Aws::String&& value) { m_arnHasBeenSet = true; m_arn = std::move(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline void SetArn(const char* value) { m_arnHasBeenSet = true; m_arn.assign(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlSummary& WithArn(const Aws::String& value) { SetArn(value); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlSummary& WithArn(Aws::String&& value) { SetArn(std::move(value)); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The ARN of the enabled control.</p>
      */
     inline EnabledControlSummary& WithArn(const char* value) { SetArn(value); return *this;}
 
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline const Aws::String& GetControlIdentifier() const{ return m_controlIdentifier; }
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline bool ControlIdentifierHasBeenSet() const { return m_controlIdentifierHasBeenSet; }
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetControlIdentifier(const Aws::String& value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier = value; }
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetControlIdentifier(Aws::String&& value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier = std::move(value); }
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetControlIdentifier(const char* value) { m_controlIdentifierHasBeenSet = true; m_controlIdentifier.assign(value); }
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline EnabledControlSummary& WithControlIdentifier(const Aws::String& value) { SetControlIdentifier(value); return *this;}
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline EnabledControlSummary& WithControlIdentifier(Aws::String&& value) { SetControlIdentifier(std::move(value)); return *this;}
 
     /**
-     * <p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b>
-     * controls are permitted, with the exception of the <b>Region deny</b> control.
-     * For information on how to find the <code>controlIdentifier</code>, see <a
-     * href="https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html">the
-     * overview page</a>.</p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline EnabledControlSummary& WithControlIdentifier(const char* value) { SetControlIdentifier(value); return *this;}
 
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline const DriftStatusSummary& GetDriftStatusSummary() const{ return m_driftStatusSummary; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline bool DriftStatusSummaryHasBeenSet() const { return m_driftStatusSummaryHasBeenSet; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline void SetDriftStatusSummary(const DriftStatusSummary& value) { m_driftStatusSummaryHasBeenSet = true; m_driftStatusSummary = value; }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline void SetDriftStatusSummary(DriftStatusSummary&& value) { m_driftStatusSummaryHasBeenSet = true; m_driftStatusSummary = std::move(value); }
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline EnabledControlSummary& WithDriftStatusSummary(const DriftStatusSummary& value) { SetDriftStatusSummary(value); return *this;}
 
     /**
-     * <p> The drift status of the enabled control. </p>
+     * <p>The drift status of the enabled control.</p>
      */
     inline EnabledControlSummary& WithDriftStatusSummary(DriftStatusSummary&& value) { SetDriftStatusSummary(std::move(value)); return *this;}
 
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline const EnablementStatusSummary& GetStatusSummary() const{ return m_statusSummary; }
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline bool StatusSummaryHasBeenSet() const { return m_statusSummaryHasBeenSet; }
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline void SetStatusSummary(const EnablementStatusSummary& value) { m_statusSummaryHasBeenSet = true; m_statusSummary = value; }
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline void SetStatusSummary(EnablementStatusSummary&& value) { m_statusSummaryHasBeenSet = true; m_statusSummary = std::move(value); }
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline EnabledControlSummary& WithStatusSummary(const EnablementStatusSummary& value) { SetStatusSummary(value); return *this;}
 
     /**
-     * <zonbook></zonbook><xhtml></xhtml>
+     * <p>A short description of the status of the enabled control.</p>
      */
     inline EnabledControlSummary& WithStatusSummary(EnablementStatusSummary&& value) { SetStatusSummary(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnablementStatusSummary.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnablementStatusSummary.h
index 1fb3acda4a3..982a96eee26 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnablementStatusSummary.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/EnablementStatusSummary.h
@@ -25,8 +25,7 @@ namespace Model
 {
 
   /**
-   * <p> The deployment summary of the enabled control. </p><p><h3>See Also:</h3>  
-   * <a
+   * <p>The deployment summary of the enabled control.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/controltower-2018-05-10/EnablementStatusSummary">AWS
    * API Reference</a></p>
    */
@@ -40,42 +39,42 @@ namespace Model
 
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline const Aws::String& GetLastOperationIdentifier() const{ return m_lastOperationIdentifier; }
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline bool LastOperationIdentifierHasBeenSet() const { return m_lastOperationIdentifierHasBeenSet; }
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline void SetLastOperationIdentifier(const Aws::String& value) { m_lastOperationIdentifierHasBeenSet = true; m_lastOperationIdentifier = value; }
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline void SetLastOperationIdentifier(Aws::String&& value) { m_lastOperationIdentifierHasBeenSet = true; m_lastOperationIdentifier = std::move(value); }
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline void SetLastOperationIdentifier(const char* value) { m_lastOperationIdentifierHasBeenSet = true; m_lastOperationIdentifier.assign(value); }
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline EnablementStatusSummary& WithLastOperationIdentifier(const Aws::String& value) { SetLastOperationIdentifier(value); return *this;}
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline EnablementStatusSummary& WithLastOperationIdentifier(Aws::String&& value) { SetLastOperationIdentifier(std::move(value)); return *this;}
 
     /**
-     * <p> The last operation identifier for the enabled control. </p>
+     * <p>The last operation identifier for the enabled control.</p>
      */
     inline EnablementStatusSummary& WithLastOperationIdentifier(const char* value) { SetLastOperationIdentifier(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlRequest.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlRequest.h
index 84c08c0fba9..57da958bd99 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlRequest.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlRequest.h
@@ -33,42 +33,42 @@ namespace Model
 
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline const Aws::String& GetEnabledControlIdentifier() const{ return m_enabledControlIdentifier; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline bool EnabledControlIdentifierHasBeenSet() const { return m_enabledControlIdentifierHasBeenSet; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetEnabledControlIdentifier(const Aws::String& value) { m_enabledControlIdentifierHasBeenSet = true; m_enabledControlIdentifier = value; }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetEnabledControlIdentifier(Aws::String&& value) { m_enabledControlIdentifierHasBeenSet = true; m_enabledControlIdentifier = std::move(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline void SetEnabledControlIdentifier(const char* value) { m_enabledControlIdentifierHasBeenSet = true; m_enabledControlIdentifier.assign(value); }
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline GetEnabledControlRequest& WithEnabledControlIdentifier(const Aws::String& value) { SetEnabledControlIdentifier(value); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline GetEnabledControlRequest& WithEnabledControlIdentifier(Aws::String&& value) { SetEnabledControlIdentifier(std::move(value)); return *this;}
 
     /**
-     * <p> The ARN of the enabled control. </p>
+     * <p>The <code>controlIdentifier</code> of the enabled control.</p>
      */
     inline GetEnabledControlRequest& WithEnabledControlIdentifier(const char* value) { SetEnabledControlIdentifier(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlResult.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlResult.h
index 7e196f5129d..d6416a6b090 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlResult.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/GetEnabledControlResult.h
@@ -34,27 +34,27 @@ namespace Model
 
 
     /**
-     * <p> Information about the enabled control. </p>
+     * <p>Information about the enabled control.</p>
      */
     inline const EnabledControlDetails& GetEnabledControlDetails() const{ return m_enabledControlDetails; }
 
     /**
-     * <p> Information about the enabled control. </p>
+     * <p>Information about the enabled control.</p>
      */
     inline void SetEnabledControlDetails(const EnabledControlDetails& value) { m_enabledControlDetails = value; }
 
     /**
-     * <p> Information about the enabled control. </p>
+     * <p>Information about the enabled control.</p>
      */
     inline void SetEnabledControlDetails(EnabledControlDetails&& value) { m_enabledControlDetails = std::move(value); }
 
     /**
-     * <p> Information about the enabled control. </p>
+     * <p>Information about the enabled control.</p>
      */
     inline GetEnabledControlResult& WithEnabledControlDetails(const EnabledControlDetails& value) { SetEnabledControlDetails(value); return *this;}
 
     /**
-     * <p> Information about the enabled control. </p>
+     * <p>Information about the enabled control.</p>
      */
     inline GetEnabledControlResult& WithEnabledControlDetails(EnabledControlDetails&& value) { SetEnabledControlDetails(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceRequest.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceRequest.h
new file mode 100644
index 00000000000..a5869743523
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceRequest.h
@@ -0,0 +1,83 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/controltower/ControlTowerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace ControlTower
+{
+namespace Model
+{
+
+  /**
+   */
+  class ListTagsForResourceRequest : public ControlTowerRequest
+  {
+  public:
+    AWS_CONTROLTOWER_API ListTagsForResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListTagsForResource"; }
+
+    AWS_CONTROLTOWER_API Aws::String SerializePayload() const override;
+
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline const Aws::String& GetResourceArn() const{ return m_resourceArn; }
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline bool ResourceArnHasBeenSet() const { return m_resourceArnHasBeenSet; }
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(const Aws::String& value) { m_resourceArnHasBeenSet = true; m_resourceArn = value; }
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(Aws::String&& value) { m_resourceArnHasBeenSet = true; m_resourceArn = std::move(value); }
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(const char* value) { m_resourceArnHasBeenSet = true; m_resourceArn.assign(value); }
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline ListTagsForResourceRequest& WithResourceArn(const Aws::String& value) { SetResourceArn(value); return *this;}
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline ListTagsForResourceRequest& WithResourceArn(Aws::String&& value) { SetResourceArn(std::move(value)); return *this;}
+
+    /**
+     * <p> The ARN of the resource.</p>
+     */
+    inline ListTagsForResourceRequest& WithResourceArn(const char* value) { SetResourceArn(value); return *this;}
+
+  private:
+
+    Aws::String m_resourceArn;
+    bool m_resourceArnHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceResult.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceResult.h
new file mode 100644
index 00000000000..17a00198807
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/ListTagsForResourceResult.h
@@ -0,0 +1,127 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSMap.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace ControlTower
+{
+namespace Model
+{
+  class ListTagsForResourceResult
+  {
+  public:
+    AWS_CONTROLTOWER_API ListTagsForResourceResult();
+    AWS_CONTROLTOWER_API ListTagsForResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_CONTROLTOWER_API ListTagsForResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline const Aws::Map<Aws::String, Aws::String>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline void SetTags(const Aws::Map<Aws::String, Aws::String>& value) { m_tags = value; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline void SetTags(Aws::Map<Aws::String, Aws::String>&& value) { m_tags = std::move(value); }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& WithTags(const Aws::Map<Aws::String, Aws::String>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& WithTags(Aws::Map<Aws::String, Aws::String>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(const Aws::String& key, const Aws::String& value) { m_tags.emplace(key, value); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(Aws::String&& key, const Aws::String& value) { m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(const Aws::String& key, Aws::String&& value) { m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(Aws::String&& key, Aws::String&& value) { m_tags.emplace(std::move(key), std::move(value)); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(const char* key, Aws::String&& value) { m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(Aws::String&& key, const char* value) { m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>A list of tags, as <code>key:value</code> strings.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(const char* key, const char* value) { m_tags.emplace(key, value); return *this; }
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline ListTagsForResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline ListTagsForResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline ListTagsForResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::Map<Aws::String, Aws::String> m_tags;
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/Region.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/Region.h
index 5d57acdf480..fede02803a2 100644
--- a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/Region.h
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/Region.h
@@ -43,42 +43,42 @@ namespace Model
 
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline const Aws::String& GetName() const{ return m_name; }
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline Region& WithName(const Aws::String& value) { SetName(value); return *this;}
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline Region& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
 
     /**
-     * <p> The AWS Region name. </p>
+     * <p>The AWS Region name.</p>
      */
     inline Region& WithName(const char* value) { SetName(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceRequest.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceRequest.h
new file mode 100644
index 00000000000..89656e64cee
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceRequest.h
@@ -0,0 +1,153 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/controltower/ControlTowerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSMap.h>
+#include <utility>
+
+namespace Aws
+{
+namespace ControlTower
+{
+namespace Model
+{
+
+  /**
+   */
+  class TagResourceRequest : public ControlTowerRequest
+  {
+  public:
+    AWS_CONTROLTOWER_API TagResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "TagResource"; }
+
+    AWS_CONTROLTOWER_API Aws::String SerializePayload() const override;
+
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline const Aws::String& GetResourceArn() const{ return m_resourceArn; }
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline bool ResourceArnHasBeenSet() const { return m_resourceArnHasBeenSet; }
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline void SetResourceArn(const Aws::String& value) { m_resourceArnHasBeenSet = true; m_resourceArn = value; }
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline void SetResourceArn(Aws::String&& value) { m_resourceArnHasBeenSet = true; m_resourceArn = std::move(value); }
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline void SetResourceArn(const char* value) { m_resourceArnHasBeenSet = true; m_resourceArn.assign(value); }
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline TagResourceRequest& WithResourceArn(const Aws::String& value) { SetResourceArn(value); return *this;}
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline TagResourceRequest& WithResourceArn(Aws::String&& value) { SetResourceArn(std::move(value)); return *this;}
+
+    /**
+     * <p>The ARN of the resource to be tagged.</p>
+     */
+    inline TagResourceRequest& WithResourceArn(const char* value) { SetResourceArn(value); return *this;}
+
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline const Aws::Map<Aws::String, Aws::String>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline void SetTags(const Aws::Map<Aws::String, Aws::String>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline void SetTags(Aws::Map<Aws::String, Aws::String>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& WithTags(const Aws::Map<Aws::String, Aws::String>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& WithTags(Aws::Map<Aws::String, Aws::String>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(const Aws::String& key, const Aws::String& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(Aws::String&& key, const Aws::String& value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(const Aws::String& key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(Aws::String&& key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(const char* key, Aws::String&& value) { m_tagsHasBeenSet = true; m_tags.emplace(key, std::move(value)); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(Aws::String&& key, const char* value) { m_tagsHasBeenSet = true; m_tags.emplace(std::move(key), value); return *this; }
+
+    /**
+     * <p>Tags to be applied to the resource.</p>
+     */
+    inline TagResourceRequest& AddTags(const char* key, const char* value) { m_tagsHasBeenSet = true; m_tags.emplace(key, value); return *this; }
+
+  private:
+
+    Aws::String m_resourceArn;
+    bool m_resourceArnHasBeenSet = false;
+
+    Aws::Map<Aws::String, Aws::String> m_tags;
+    bool m_tagsHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceResult.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceResult.h
new file mode 100644
index 00000000000..f1aa14547b5
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/TagResourceResult.h
@@ -0,0 +1,63 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace ControlTower
+{
+namespace Model
+{
+  class TagResourceResult
+  {
+  public:
+    AWS_CONTROLTOWER_API TagResourceResult();
+    AWS_CONTROLTOWER_API TagResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_CONTROLTOWER_API TagResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline TagResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline TagResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline TagResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceRequest.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceRequest.h
new file mode 100644
index 00000000000..7610221d30b
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceRequest.h
@@ -0,0 +1,139 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/controltower/ControlTowerRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace ControlTower
+{
+namespace Model
+{
+
+  /**
+   */
+  class UntagResourceRequest : public ControlTowerRequest
+  {
+  public:
+    AWS_CONTROLTOWER_API UntagResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "UntagResource"; }
+
+    AWS_CONTROLTOWER_API Aws::String SerializePayload() const override;
+
+    AWS_CONTROLTOWER_API void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline const Aws::String& GetResourceArn() const{ return m_resourceArn; }
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline bool ResourceArnHasBeenSet() const { return m_resourceArnHasBeenSet; }
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(const Aws::String& value) { m_resourceArnHasBeenSet = true; m_resourceArn = value; }
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(Aws::String&& value) { m_resourceArnHasBeenSet = true; m_resourceArn = std::move(value); }
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline void SetResourceArn(const char* value) { m_resourceArnHasBeenSet = true; m_resourceArn.assign(value); }
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline UntagResourceRequest& WithResourceArn(const Aws::String& value) { SetResourceArn(value); return *this;}
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline UntagResourceRequest& WithResourceArn(Aws::String&& value) { SetResourceArn(std::move(value)); return *this;}
+
+    /**
+     * <p>The ARN of the resource.</p>
+     */
+    inline UntagResourceRequest& WithResourceArn(const char* value) { SetResourceArn(value); return *this;}
+
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetTagKeys() const{ return m_tagKeys; }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline bool TagKeysHasBeenSet() const { return m_tagKeysHasBeenSet; }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline void SetTagKeys(const Aws::Vector<Aws::String>& value) { m_tagKeysHasBeenSet = true; m_tagKeys = value; }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline void SetTagKeys(Aws::Vector<Aws::String>&& value) { m_tagKeysHasBeenSet = true; m_tagKeys = std::move(value); }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline UntagResourceRequest& WithTagKeys(const Aws::Vector<Aws::String>& value) { SetTagKeys(value); return *this;}
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline UntagResourceRequest& WithTagKeys(Aws::Vector<Aws::String>&& value) { SetTagKeys(std::move(value)); return *this;}
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(const Aws::String& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(Aws::String&& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p>Tag keys to be removed from the resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(const char* value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+  private:
+
+    Aws::String m_resourceArn;
+    bool m_resourceArnHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_tagKeys;
+    bool m_tagKeysHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceResult.h b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceResult.h
new file mode 100644
index 00000000000..1f0528378a8
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/include/aws/controltower/model/UntagResourceResult.h
@@ -0,0 +1,63 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace ControlTower
+{
+namespace Model
+{
+  class UntagResourceResult
+  {
+  public:
+    AWS_CONTROLTOWER_API UntagResourceResult();
+    AWS_CONTROLTOWER_API UntagResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_CONTROLTOWER_API UntagResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline UntagResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline UntagResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline UntagResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace ControlTower
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-controltower/source/ControlTowerClient.cpp b/generated/src/aws-cpp-sdk-controltower/source/ControlTowerClient.cpp
index 5714fdd541b..449f63adb48 100644
--- a/generated/src/aws-cpp-sdk-controltower/source/ControlTowerClient.cpp
+++ b/generated/src/aws-cpp-sdk-controltower/source/ControlTowerClient.cpp
@@ -26,6 +26,9 @@
 #include <aws/controltower/model/GetControlOperationRequest.h>
 #include <aws/controltower/model/GetEnabledControlRequest.h>
 #include <aws/controltower/model/ListEnabledControlsRequest.h>
+#include <aws/controltower/model/ListTagsForResourceRequest.h>
+#include <aws/controltower/model/TagResourceRequest.h>
+#include <aws/controltower/model/UntagResourceRequest.h>
 
 #include <smithy/tracing/TracingUtils.h>
 
@@ -294,3 +297,107 @@ ListEnabledControlsOutcome ControlTowerClient::ListEnabledControls(const ListEna
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+ListTagsForResourceOutcome ControlTowerClient::ListTagsForResource(const ListTagsForResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(ListTagsForResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ListTagsForResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ResourceArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ListTagsForResource", "Required field: ResourceArn, is not set");
+    return ListTagsForResourceOutcome(Aws::Client::AWSError<ControlTowerErrors>(ControlTowerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ResourceArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ListTagsForResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, ListTagsForResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ListTagsForResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<ListTagsForResourceOutcome>(
+    [&]()-> ListTagsForResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ListTagsForResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/tags/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetResourceArn());
+      return ListTagsForResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
+TagResourceOutcome ControlTowerClient::TagResource(const TagResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(TagResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, TagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ResourceArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("TagResource", "Required field: ResourceArn, is not set");
+    return TagResourceOutcome(Aws::Client::AWSError<ControlTowerErrors>(ControlTowerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ResourceArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, TagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, TagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".TagResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<TagResourceOutcome>(
+    [&]()-> TagResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, TagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/tags/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetResourceArn());
+      return TagResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
+UntagResourceOutcome ControlTowerClient::UntagResource(const UntagResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(UntagResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UntagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ResourceArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UntagResource", "Required field: ResourceArn, is not set");
+    return UntagResourceOutcome(Aws::Client::AWSError<ControlTowerErrors>(ControlTowerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ResourceArn]", false));
+  }
+  if (!request.TagKeysHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UntagResource", "Required field: TagKeys, is not set");
+    return UntagResourceOutcome(Aws::Client::AWSError<ControlTowerErrors>(ControlTowerErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [TagKeys]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UntagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UntagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UntagResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UntagResourceOutcome>(
+    [&]()-> UntagResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UntagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/tags/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetResourceArn());
+      return UntagResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_DELETE, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
diff --git a/generated/src/aws-cpp-sdk-controltower/source/ControlTowerEndpointRules.cpp b/generated/src/aws-cpp-sdk-controltower/source/ControlTowerEndpointRules.cpp
index f48ed8a979d..d8ed37c8419 100644
--- a/generated/src/aws-cpp-sdk-controltower/source/ControlTowerEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-controltower/source/ControlTowerEndpointRules.cpp
@@ -51,107 +51,107 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t',
-'r','o','l','t','o','w','e','r','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P',
-'a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D',
-'n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
-'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
-'n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a',
-'l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t',
-'h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u',
-'p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',
-':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
-'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',',
-'t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s',
-'u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',
-',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{',
-'"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t',
-'"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l',
-'t','o','w','e','r','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t',
-'i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"',
-'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
-'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':',
-'"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',
-' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o',
-'r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',
-'}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b',
-'o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r',
-'e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']',
-'}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':',
-'[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',
-',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[',
-'{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',
-',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',
-',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{',
-'"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t',
-'"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l',
-'t','o','w','e','r','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n',
-'R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x',
-'}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e',
-'r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"',
-'}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r',
-'o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',
-' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ',
-'n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t',
-'y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i',
-'o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',
-':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l','t','o','w','e','r','.','{','R',
-'e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d',
-'n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
 '}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
-'n','d','p','o','i','n','t','"','}',']','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
+'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l','t','o','w',
+'e','r','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
+'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
+'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
+'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
+'t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',
+' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e',
+'d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e',
+'s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h',
+'"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',
+':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u',
+'e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
+',','"','a','r','g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',',
+'"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n',
+'R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',
+',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r',
+'l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l','t','o','w','e','r','-',
+'f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r',
+'t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t',
+'y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':',
+'"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',',
+'"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ',
+'b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n',
+'o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"',
+'e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{',
+'"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l',
+'e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',
+':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',',
+'"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',',
+'"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n',
+'R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a',
+'c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r',
+'l','"',':','"','h','t','t','p','s',':','/','/','c','o','n','t','r','o','l','t','o','w','e','r','.',
+'{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r',
+'o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}',
+'}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
+':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',
+' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i',
+'o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S',
+'t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t',
+'y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
+'"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h',
+'t','t','p','s',':','/','/','c','o','n','t','r','o','l','t','o','w','e','r','.','{','R','e','g','i',
+'o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S',
+'u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"',
+'h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p',
+'o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',']',',','"',
+'t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n',
 's','"',':','[',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
 'n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g','i',
 'o','n','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlRequest.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlRequest.cpp
index bc018c77b5d..3ec902a3d8f 100644
--- a/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlRequest.cpp
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlRequest.cpp
@@ -14,6 +14,7 @@ using namespace Aws::Utils;
 
 EnableControlRequest::EnableControlRequest() : 
     m_controlIdentifierHasBeenSet(false),
+    m_tagsHasBeenSet(false),
     m_targetIdentifierHasBeenSet(false)
 {
 }
@@ -28,6 +29,17 @@ Aws::String EnableControlRequest::SerializePayload() const
 
   }
 
+  if(m_tagsHasBeenSet)
+  {
+   JsonValue tagsJsonMap;
+   for(auto& tagsItem : m_tags)
+   {
+     tagsJsonMap.WithString(tagsItem.first, tagsItem.second);
+   }
+   payload.WithObject("tags", std::move(tagsJsonMap));
+
+  }
+
   if(m_targetIdentifierHasBeenSet)
   {
    payload.WithString("targetIdentifier", m_targetIdentifier);
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlResult.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlResult.cpp
index f0c42b40841..d705156be65 100644
--- a/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlResult.cpp
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/EnableControlResult.cpp
@@ -29,6 +29,12 @@ EnableControlResult::EnableControlResult(const Aws::AmazonWebServiceResult<JsonV
 EnableControlResult& EnableControlResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("arn"))
+  {
+    m_arn = jsonValue.GetString("arn");
+
+  }
+
   if(jsonValue.ValueExists("operationIdentifier"))
   {
     m_operationIdentifier = jsonValue.GetString("operationIdentifier");
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceRequest.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceRequest.cpp
new file mode 100644
index 00000000000..0ede6e5a1b9
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceRequest.cpp
@@ -0,0 +1,27 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/ListTagsForResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+ListTagsForResourceRequest::ListTagsForResourceRequest() : 
+    m_resourceArnHasBeenSet(false)
+{
+}
+
+Aws::String ListTagsForResourceRequest::SerializePayload() const
+{
+  return {};
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceResult.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceResult.cpp
new file mode 100644
index 00000000000..52fa477756c
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/ListTagsForResourceResult.cpp
@@ -0,0 +1,51 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/ListTagsForResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListTagsForResourceResult::ListTagsForResourceResult()
+{
+}
+
+ListTagsForResourceResult::ListTagsForResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListTagsForResourceResult& ListTagsForResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("tags"))
+  {
+    Aws::Map<Aws::String, JsonView> tagsJsonMap = jsonValue.GetObject("tags").GetAllObjects();
+    for(auto& tagsItem : tagsJsonMap)
+    {
+      m_tags[tagsItem.first] = tagsItem.second.AsString();
+    }
+  }
+
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceRequest.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceRequest.cpp
new file mode 100644
index 00000000000..61597e56429
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceRequest.cpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/TagResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+TagResourceRequest::TagResourceRequest() : 
+    m_resourceArnHasBeenSet(false),
+    m_tagsHasBeenSet(false)
+{
+}
+
+Aws::String TagResourceRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_tagsHasBeenSet)
+  {
+   JsonValue tagsJsonMap;
+   for(auto& tagsItem : m_tags)
+   {
+     tagsJsonMap.WithString(tagsItem.first, tagsItem.second);
+   }
+   payload.WithObject("tags", std::move(tagsJsonMap));
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceResult.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceResult.cpp
new file mode 100644
index 00000000000..6ba03eecd05
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/TagResourceResult.cpp
@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/TagResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+TagResourceResult::TagResourceResult()
+{
+}
+
+TagResourceResult::TagResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+TagResourceResult& TagResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  AWS_UNREFERENCED_PARAM(result);
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceRequest.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceRequest.cpp
new file mode 100644
index 00000000000..2854d411c32
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceRequest.cpp
@@ -0,0 +1,45 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/UntagResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+UntagResourceRequest::UntagResourceRequest() : 
+    m_resourceArnHasBeenSet(false),
+    m_tagKeysHasBeenSet(false)
+{
+}
+
+Aws::String UntagResourceRequest::SerializePayload() const
+{
+  return {};
+}
+
+void UntagResourceRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_tagKeysHasBeenSet)
+    {
+      for(const auto& item : m_tagKeys)
+      {
+        ss << item;
+        uri.AddQueryStringParameter("tagKeys", ss.str());
+        ss.str("");
+      }
+    }
+
+}
+
+
+
diff --git a/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceResult.cpp b/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceResult.cpp
new file mode 100644
index 00000000000..dec19fa9852
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-controltower/source/model/UntagResourceResult.cpp
@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/controltower/model/UntagResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::ControlTower::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+UntagResourceResult::UntagResourceResult()
+{
+}
+
+UntagResourceResult::UntagResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+UntagResourceResult& UntagResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  AWS_UNREFERENCED_PARAM(result);
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceClient.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceClient.h
index 4800e31c77f..e292be02b35 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceClient.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceClient.h
@@ -16,14 +16,16 @@ namespace Aws
 namespace CostandUsageReportService
 {
   /**
-   * <p>The AWS Cost and Usage Report API enables you to programmatically create,
-   * query, and delete AWS Cost and Usage report definitions.</p> <p>AWS Cost and
-   * Usage reports track the monthly AWS costs and usage associated with your AWS
-   * account. The report contains line items for each unique combination of AWS
-   * product, usage type, and operation that your AWS account uses. You can configure
-   * the AWS Cost and Usage report to show only the data that you want, using the AWS
-   * Cost and Usage API.</p> <p>Service Endpoint</p> <p>The AWS Cost and Usage Report
-   * API provides the following endpoint:</p> <ul> <li>
+   * <p>You can use the Amazon Web Services Cost and Usage Report API to
+   * programmatically create, query, and delete Amazon Web Services Cost and Usage
+   * Report definitions.</p> <p>Amazon Web Services Cost and Usage Report track the
+   * monthly Amazon Web Services costs and usage associated with your Amazon Web
+   * Services account. The report contains line items for each unique combination of
+   * Amazon Web Services product, usage type, and operation that your Amazon Web
+   * Services account uses. You can configure the Amazon Web Services Cost and Usage
+   * Report to show only the data that you want, using the Amazon Web Services Cost
+   * and Usage Report API.</p> <p>Service Endpoint</p> <p>The Amazon Web Services
+   * Cost and Usage Report API provides the following endpoint:</p> <ul> <li>
    * <p>cur.us-east-1.amazonaws.com</p> </li> </ul>
    */
   class AWS_COSTANDUSAGEREPORTSERVICE_API CostandUsageReportServiceClient : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<CostandUsageReportServiceClient>
@@ -85,7 +87,8 @@ namespace CostandUsageReportService
         virtual ~CostandUsageReportServiceClient();
 
         /**
-         * <p>Deletes the specified report.</p><p><h3>See Also:</h3>   <a
+         * <p>Deletes the specified report. Any tags associated with the report are also
+         * deleted.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/DeleteReportDefinition">AWS
          * API Reference</a></p>
          */
@@ -110,8 +113,8 @@ namespace CostandUsageReportService
         }
 
         /**
-         * <p>Lists the AWS Cost and Usage reports available to this account.</p><p><h3>See
-         * Also:</h3>   <a
+         * <p>Lists the Amazon Web Services Cost and Usage Report available to this
+         * account.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/DescribeReportDefinitions">AWS
          * API Reference</a></p>
          */
@@ -136,7 +139,33 @@ namespace CostandUsageReportService
         }
 
         /**
-         * <p>Allows you to programatically update your report preferences.</p><p><h3>See
+         * <p>Lists the tags associated with the specified report definition.</p><p><h3>See
+         * Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/ListTagsForResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListTagsForResourceOutcome ListTagsForResource(const Model::ListTagsForResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for ListTagsForResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename ListTagsForResourceRequestT = Model::ListTagsForResourceRequest>
+        Model::ListTagsForResourceOutcomeCallable ListTagsForResourceCallable(const ListTagsForResourceRequestT& request) const
+        {
+            return SubmitCallable(&CostandUsageReportServiceClient::ListTagsForResource, request);
+        }
+
+        /**
+         * An Async wrapper for ListTagsForResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename ListTagsForResourceRequestT = Model::ListTagsForResourceRequest>
+        void ListTagsForResourceAsync(const ListTagsForResourceRequestT& request, const ListTagsForResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&CostandUsageReportServiceClient::ListTagsForResource, request, handler, context);
+        }
+
+        /**
+         * <p>Allows you to programmatically update your report preferences.</p><p><h3>See
          * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/ModifyReportDefinition">AWS
          * API Reference</a></p>
@@ -187,6 +216,57 @@ namespace CostandUsageReportService
             return SubmitAsync(&CostandUsageReportServiceClient::PutReportDefinition, request, handler, context);
         }
 
+        /**
+         * <p>Associates a set of tags with a report definition.</p><p><h3>See Also:</h3>  
+         * <a href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/TagResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::TagResourceOutcome TagResource(const Model::TagResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for TagResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename TagResourceRequestT = Model::TagResourceRequest>
+        Model::TagResourceOutcomeCallable TagResourceCallable(const TagResourceRequestT& request) const
+        {
+            return SubmitCallable(&CostandUsageReportServiceClient::TagResource, request);
+        }
+
+        /**
+         * An Async wrapper for TagResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename TagResourceRequestT = Model::TagResourceRequest>
+        void TagResourceAsync(const TagResourceRequestT& request, const TagResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&CostandUsageReportServiceClient::TagResource, request, handler, context);
+        }
+
+        /**
+         * <p>Disassociates a set of tags from a report definition.</p><p><h3>See
+         * Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/UntagResource">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UntagResourceOutcome UntagResource(const Model::UntagResourceRequest& request) const;
+
+        /**
+         * A Callable wrapper for UntagResource that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UntagResourceRequestT = Model::UntagResourceRequest>
+        Model::UntagResourceOutcomeCallable UntagResourceCallable(const UntagResourceRequestT& request) const
+        {
+            return SubmitCallable(&CostandUsageReportServiceClient::UntagResource, request);
+        }
+
+        /**
+         * An Async wrapper for UntagResource that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UntagResourceRequestT = Model::UntagResourceRequest>
+        void UntagResourceAsync(const UntagResourceRequestT& request, const UntagResourceResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&CostandUsageReportServiceClient::UntagResource, request, handler, context);
+        }
+
 
       void OverrideEndpoint(const Aws::String& endpoint);
       std::shared_ptr<CostandUsageReportServiceEndpointProviderBase>& accessEndpointProvider();
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceServiceClientModel.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceServiceClientModel.h
index 7d51231ea02..8618f4c6094 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/CostandUsageReportServiceServiceClientModel.h
@@ -20,8 +20,11 @@
 /* Service model headers required in CostandUsageReportServiceClient header */
 #include <aws/cur/model/DeleteReportDefinitionResult.h>
 #include <aws/cur/model/DescribeReportDefinitionsResult.h>
+#include <aws/cur/model/ListTagsForResourceResult.h>
 #include <aws/cur/model/ModifyReportDefinitionResult.h>
 #include <aws/cur/model/PutReportDefinitionResult.h>
+#include <aws/cur/model/TagResourceResult.h>
+#include <aws/cur/model/UntagResourceResult.h>
 /* End of service model headers required in CostandUsageReportServiceClient header */
 
 namespace Aws
@@ -64,22 +67,31 @@ namespace Aws
       /* Service model forward declarations required in CostandUsageReportServiceClient header */
       class DeleteReportDefinitionRequest;
       class DescribeReportDefinitionsRequest;
+      class ListTagsForResourceRequest;
       class ModifyReportDefinitionRequest;
       class PutReportDefinitionRequest;
+      class TagResourceRequest;
+      class UntagResourceRequest;
       /* End of service model forward declarations required in CostandUsageReportServiceClient header */
 
       /* Service model Outcome class definitions */
       typedef Aws::Utils::Outcome<DeleteReportDefinitionResult, CostandUsageReportServiceError> DeleteReportDefinitionOutcome;
       typedef Aws::Utils::Outcome<DescribeReportDefinitionsResult, CostandUsageReportServiceError> DescribeReportDefinitionsOutcome;
+      typedef Aws::Utils::Outcome<ListTagsForResourceResult, CostandUsageReportServiceError> ListTagsForResourceOutcome;
       typedef Aws::Utils::Outcome<ModifyReportDefinitionResult, CostandUsageReportServiceError> ModifyReportDefinitionOutcome;
       typedef Aws::Utils::Outcome<PutReportDefinitionResult, CostandUsageReportServiceError> PutReportDefinitionOutcome;
+      typedef Aws::Utils::Outcome<TagResourceResult, CostandUsageReportServiceError> TagResourceOutcome;
+      typedef Aws::Utils::Outcome<UntagResourceResult, CostandUsageReportServiceError> UntagResourceOutcome;
       /* End of service model Outcome class definitions */
 
       /* Service model Outcome callable definitions */
       typedef std::future<DeleteReportDefinitionOutcome> DeleteReportDefinitionOutcomeCallable;
       typedef std::future<DescribeReportDefinitionsOutcome> DescribeReportDefinitionsOutcomeCallable;
+      typedef std::future<ListTagsForResourceOutcome> ListTagsForResourceOutcomeCallable;
       typedef std::future<ModifyReportDefinitionOutcome> ModifyReportDefinitionOutcomeCallable;
       typedef std::future<PutReportDefinitionOutcome> PutReportDefinitionOutcomeCallable;
+      typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
+      typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
       /* End of service model Outcome callable definitions */
     } // namespace Model
 
@@ -88,8 +100,11 @@ namespace Aws
     /* Service model async handlers definitions */
     typedef std::function<void(const CostandUsageReportServiceClient*, const Model::DeleteReportDefinitionRequest&, const Model::DeleteReportDefinitionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteReportDefinitionResponseReceivedHandler;
     typedef std::function<void(const CostandUsageReportServiceClient*, const Model::DescribeReportDefinitionsRequest&, const Model::DescribeReportDefinitionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeReportDefinitionsResponseReceivedHandler;
+    typedef std::function<void(const CostandUsageReportServiceClient*, const Model::ListTagsForResourceRequest&, const Model::ListTagsForResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListTagsForResourceResponseReceivedHandler;
     typedef std::function<void(const CostandUsageReportServiceClient*, const Model::ModifyReportDefinitionRequest&, const Model::ModifyReportDefinitionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ModifyReportDefinitionResponseReceivedHandler;
     typedef std::function<void(const CostandUsageReportServiceClient*, const Model::PutReportDefinitionRequest&, const Model::PutReportDefinitionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PutReportDefinitionResponseReceivedHandler;
+    typedef std::function<void(const CostandUsageReportServiceClient*, const Model::TagResourceRequest&, const Model::TagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TagResourceResponseReceivedHandler;
+    typedef std::function<void(const CostandUsageReportServiceClient*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
     /* End of service model async handlers definitions */
   } // namespace CostandUsageReportService
 } // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsRequest.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsRequest.h
index 587c5414ad9..b8ed47799a6 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsRequest.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsRequest.h
@@ -17,7 +17,7 @@ namespace Model
 {
 
   /**
-   * <p>Requests a list of AWS Cost and Usage reports owned by the
+   * <p>Requests a Amazon Web Services Cost and Usage Report list owned by the
    * account.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/DescribeReportDefinitionsRequest">AWS
    * API Reference</a></p>
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsResult.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsResult.h
index 3277ee86c84..1193969d765 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsResult.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/DescribeReportDefinitionsResult.h
@@ -41,37 +41,37 @@ namespace Model
 
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline const Aws::Vector<ReportDefinition>& GetReportDefinitions() const{ return m_reportDefinitions; }
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline void SetReportDefinitions(const Aws::Vector<ReportDefinition>& value) { m_reportDefinitions = value; }
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline void SetReportDefinitions(Aws::Vector<ReportDefinition>&& value) { m_reportDefinitions = std::move(value); }
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline DescribeReportDefinitionsResult& WithReportDefinitions(const Aws::Vector<ReportDefinition>& value) { SetReportDefinitions(value); return *this;}
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline DescribeReportDefinitionsResult& WithReportDefinitions(Aws::Vector<ReportDefinition>&& value) { SetReportDefinitions(std::move(value)); return *this;}
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline DescribeReportDefinitionsResult& AddReportDefinitions(const ReportDefinition& value) { m_reportDefinitions.push_back(value); return *this; }
 
     /**
-     * <p>A list of AWS Cost and Usage reports owned by the account.</p>
+     * <p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>
      */
     inline DescribeReportDefinitionsResult& AddReportDefinitions(ReportDefinition&& value) { m_reportDefinitions.push_back(std::move(value)); return *this; }
 
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/LastStatus.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/LastStatus.h
new file mode 100644
index 00000000000..382b5aaf9f8
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/LastStatus.h
@@ -0,0 +1,32 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+  enum class LastStatus
+  {
+    NOT_SET,
+    SUCCESS,
+    ERROR_PERMISSIONS,
+    ERROR_NO_BUCKET
+  };
+
+namespace LastStatusMapper
+{
+AWS_COSTANDUSAGEREPORTSERVICE_API LastStatus GetLastStatusForName(const Aws::String& name);
+
+AWS_COSTANDUSAGEREPORTSERVICE_API Aws::String GetNameForLastStatus(LastStatus value);
+} // namespace LastStatusMapper
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceRequest.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceRequest.h
new file mode 100644
index 00000000000..6e9267b0563
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceRequest.h
@@ -0,0 +1,93 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/cur/CostandUsageReportServiceRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+  /**
+   */
+  class ListTagsForResourceRequest : public CostandUsageReportServiceRequest
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API ListTagsForResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListTagsForResource"; }
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::String SerializePayload() const override;
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
+
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline const Aws::String& GetReportName() const{ return m_reportName; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline bool ReportNameHasBeenSet() const { return m_reportNameHasBeenSet; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline void SetReportName(const Aws::String& value) { m_reportNameHasBeenSet = true; m_reportName = value; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline void SetReportName(Aws::String&& value) { m_reportNameHasBeenSet = true; m_reportName = std::move(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline void SetReportName(const char* value) { m_reportNameHasBeenSet = true; m_reportName.assign(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline ListTagsForResourceRequest& WithReportName(const Aws::String& value) { SetReportName(value); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline ListTagsForResourceRequest& WithReportName(Aws::String&& value) { SetReportName(std::move(value)); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be returned
+     * for.</p>
+     */
+    inline ListTagsForResourceRequest& WithReportName(const char* value) { SetReportName(value); return *this;}
+
+  private:
+
+    Aws::String m_reportName;
+    bool m_reportNameHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceResult.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceResult.h
new file mode 100644
index 00000000000..c3468086c2c
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ListTagsForResourceResult.h
@@ -0,0 +1,103 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/cur/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CostandUsageReportService
+{
+namespace Model
+{
+  class ListTagsForResourceResult
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API ListTagsForResourceResult();
+    AWS_COSTANDUSAGEREPORTSERVICE_API ListTagsForResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_COSTANDUSAGEREPORTSERVICE_API ListTagsForResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tags = value; }
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tags = std::move(value); }
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline ListTagsForResourceResult& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline ListTagsForResourceResult& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(const Tag& value) { m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>The tags assigned to the report definition resource.</p>
+     */
+    inline ListTagsForResourceResult& AddTags(Tag&& value) { m_tags.push_back(std::move(value)); return *this; }
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline ListTagsForResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline ListTagsForResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline ListTagsForResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::Vector<Tag> m_tags;
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/PutReportDefinitionRequest.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/PutReportDefinitionRequest.h
index 7dc1527a2f3..848910f8b46 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/PutReportDefinitionRequest.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/PutReportDefinitionRequest.h
@@ -7,6 +7,8 @@
 #include <aws/cur/CostandUsageReportService_EXPORTS.h>
 #include <aws/cur/CostandUsageReportServiceRequest.h>
 #include <aws/cur/model/ReportDefinition.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/cur/model/Tag.h>
 #include <utility>
 
 namespace Aws
@@ -73,10 +75,54 @@ namespace Model
      */
     inline PutReportDefinitionRequest& WithReportDefinition(ReportDefinition&& value) { SetReportDefinition(std::move(value)); return *this;}
 
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline PutReportDefinitionRequest& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline PutReportDefinitionRequest& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline PutReportDefinitionRequest& AddTags(const Tag& value) { m_tagsHasBeenSet = true; m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline PutReportDefinitionRequest& AddTags(Tag&& value) { m_tagsHasBeenSet = true; m_tags.push_back(std::move(value)); return *this; }
+
   private:
 
     ReportDefinition m_reportDefinition;
     bool m_reportDefinitionHasBeenSet = false;
+
+    Aws::Vector<Tag> m_tags;
+    bool m_tagsHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportDefinition.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportDefinition.h
index 68b99210cec..445debfc038 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportDefinition.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportDefinition.h
@@ -12,6 +12,7 @@
 #include <aws/core/utils/memory/stl/AWSVector.h>
 #include <aws/cur/model/AWSRegion.h>
 #include <aws/cur/model/ReportVersioning.h>
+#include <aws/cur/model/ReportStatus.h>
 #include <aws/cur/model/SchemaElement.h>
 #include <aws/cur/model/AdditionalArtifact.h>
 #include <utility>
@@ -32,9 +33,10 @@ namespace Model
 {
 
   /**
-   * <p>The definition of AWS Cost and Usage Report. You can specify the report name,
-   * time unit, report format, compression format, S3 bucket, additional artifacts,
-   * and schema elements in the definition. </p><p><h3>See Also:</h3>   <a
+   * <p>The definition of Amazon Web Services Cost and Usage Report. You can specify
+   * the report name, time unit, report format, compression format, S3 bucket,
+   * additional artifacts, and schema elements in the definition. </p><p><h3>See
+   * Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/ReportDefinition">AWS
    * API Reference</a></p>
    */
@@ -363,53 +365,124 @@ namespace Model
 
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline const Aws::String& GetBillingViewArn() const{ return m_billingViewArn; }
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline bool BillingViewArnHasBeenSet() const { return m_billingViewArnHasBeenSet; }
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline void SetBillingViewArn(const Aws::String& value) { m_billingViewArnHasBeenSet = true; m_billingViewArn = value; }
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline void SetBillingViewArn(Aws::String&& value) { m_billingViewArnHasBeenSet = true; m_billingViewArn = std::move(value); }
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline void SetBillingViewArn(const char* value) { m_billingViewArnHasBeenSet = true; m_billingViewArn.assign(value); }
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline ReportDefinition& WithBillingViewArn(const Aws::String& value) { SetBillingViewArn(value); return *this;}
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline ReportDefinition& WithBillingViewArn(Aws::String&& value) { SetBillingViewArn(std::move(value)); return *this;}
 
     /**
-     * <p> The Amazon resource name of the billing view. You can get this value by
-     * using the billing view service public APIs. </p>
+     * <p> The Amazon resource name of the billing view. The
+     * <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and
+     * Usage Report for each billing group maintained in the Amazon Web Services
+     * Billing Conductor service. The <code>BillingViewArn</code> for a billing group
+     * can be constructed as:
+     * <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code>
+     * </p>
      */
     inline ReportDefinition& WithBillingViewArn(const char* value) { SetBillingViewArn(value); return *this;}
 
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline const ReportStatus& GetReportStatus() const{ return m_reportStatus; }
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline bool ReportStatusHasBeenSet() const { return m_reportStatusHasBeenSet; }
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline void SetReportStatus(const ReportStatus& value) { m_reportStatusHasBeenSet = true; m_reportStatus = value; }
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline void SetReportStatus(ReportStatus&& value) { m_reportStatusHasBeenSet = true; m_reportStatus = std::move(value); }
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline ReportDefinition& WithReportStatus(const ReportStatus& value) { SetReportStatus(value); return *this;}
+
+    /**
+     * <p>The status of the report.</p>
+     */
+    inline ReportDefinition& WithReportStatus(ReportStatus&& value) { SetReportStatus(std::move(value)); return *this;}
+
   private:
 
     Aws::String m_reportName;
@@ -447,6 +520,9 @@ namespace Model
 
     Aws::String m_billingViewArn;
     bool m_billingViewArnHasBeenSet = false;
+
+    ReportStatus m_reportStatus;
+    bool m_reportStatusHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportStatus.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportStatus.h
new file mode 100644
index 00000000000..eaa0df32dc0
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/ReportStatus.h
@@ -0,0 +1,126 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/cur/model/LastStatus.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+  /**
+   * <p>A two element dictionary with a <code>lastDelivery</code> and
+   * <code>lastStatus</code> key whose values describe the date and status of the
+   * last delivered report for a particular report definition.</p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/ReportStatus">AWS
+   * API Reference</a></p>
+   */
+  class ReportStatus
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API ReportStatus();
+    AWS_COSTANDUSAGEREPORTSERVICE_API ReportStatus(Aws::Utils::Json::JsonView jsonValue);
+    AWS_COSTANDUSAGEREPORTSERVICE_API ReportStatus& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline const Aws::String& GetLastDelivery() const{ return m_lastDelivery; }
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline bool LastDeliveryHasBeenSet() const { return m_lastDeliveryHasBeenSet; }
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline void SetLastDelivery(const Aws::String& value) { m_lastDeliveryHasBeenSet = true; m_lastDelivery = value; }
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline void SetLastDelivery(Aws::String&& value) { m_lastDeliveryHasBeenSet = true; m_lastDelivery = std::move(value); }
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline void SetLastDelivery(const char* value) { m_lastDeliveryHasBeenSet = true; m_lastDelivery.assign(value); }
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline ReportStatus& WithLastDelivery(const Aws::String& value) { SetLastDelivery(value); return *this;}
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline ReportStatus& WithLastDelivery(Aws::String&& value) { SetLastDelivery(std::move(value)); return *this;}
+
+    /**
+     * <p>A timestamp that gives the date of a report delivery.</p>
+     */
+    inline ReportStatus& WithLastDelivery(const char* value) { SetLastDelivery(value); return *this;}
+
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline const LastStatus& GetLastStatus() const{ return m_lastStatus; }
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline bool LastStatusHasBeenSet() const { return m_lastStatusHasBeenSet; }
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline void SetLastStatus(const LastStatus& value) { m_lastStatusHasBeenSet = true; m_lastStatus = value; }
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline void SetLastStatus(LastStatus&& value) { m_lastStatusHasBeenSet = true; m_lastStatus = std::move(value); }
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline ReportStatus& WithLastStatus(const LastStatus& value) { SetLastStatus(value); return *this;}
+
+    /**
+     * <p>An enum that gives the status of a report delivery.</p>
+     */
+    inline ReportStatus& WithLastStatus(LastStatus&& value) { SetLastStatus(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_lastDelivery;
+    bool m_lastDeliveryHasBeenSet = false;
+
+    LastStatus m_lastStatus;
+    bool m_lastStatusHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/SchemaElement.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/SchemaElement.h
index d90c12c8376..bffe543baa4 100644
--- a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/SchemaElement.h
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/SchemaElement.h
@@ -17,7 +17,8 @@ namespace Model
   {
     NOT_SET,
     RESOURCES,
-    SPLIT_COST_ALLOCATION_DATA
+    SPLIT_COST_ALLOCATION_DATA,
+    MANUAL_DISCOUNT_COMPATIBILITY
   };
 
 namespace SchemaElementMapper
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/Tag.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/Tag.h
new file mode 100644
index 00000000000..1cca2920868
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/Tag.h
@@ -0,0 +1,157 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+  /**
+   * <p>Describes a tag. A tag is a key-value pair. You can add up to 50 tags to a
+   * report definition.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/cur-2017-01-06/Tag">AWS API
+   * Reference</a></p>
+   */
+  class Tag
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API Tag();
+    AWS_COSTANDUSAGEREPORTSERVICE_API Tag(Aws::Utils::Json::JsonView jsonValue);
+    AWS_COSTANDUSAGEREPORTSERVICE_API Tag& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline const Aws::String& GetKey() const{ return m_key; }
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline bool KeyHasBeenSet() const { return m_keyHasBeenSet; }
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline void SetKey(const Aws::String& value) { m_keyHasBeenSet = true; m_key = value; }
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline void SetKey(Aws::String&& value) { m_keyHasBeenSet = true; m_key = std::move(value); }
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline void SetKey(const char* value) { m_keyHasBeenSet = true; m_key.assign(value); }
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline Tag& WithKey(const Aws::String& value) { SetKey(value); return *this;}
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline Tag& WithKey(Aws::String&& value) { SetKey(std::move(value)); return *this;}
+
+    /**
+     * <p>The key of the tag. Tag keys are case sensitive. Each report definition can
+     * only have up to one tag with the same key. If you try to add an existing tag
+     * with the same key, the existing tag value will be updated to the new value.</p>
+     */
+    inline Tag& WithKey(const char* value) { SetKey(value); return *this;}
+
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline const Aws::String& GetValue() const{ return m_value; }
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline bool ValueHasBeenSet() const { return m_valueHasBeenSet; }
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline void SetValue(const Aws::String& value) { m_valueHasBeenSet = true; m_value = value; }
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline void SetValue(Aws::String&& value) { m_valueHasBeenSet = true; m_value = std::move(value); }
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline void SetValue(const char* value) { m_valueHasBeenSet = true; m_value.assign(value); }
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline Tag& WithValue(const Aws::String& value) { SetValue(value); return *this;}
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline Tag& WithValue(Aws::String&& value) { SetValue(std::move(value)); return *this;}
+
+    /**
+     * <p>The value of the tag. Tag values are case-sensitive. This can be an empty
+     * string.</p>
+     */
+    inline Tag& WithValue(const char* value) { SetValue(value); return *this;}
+
+  private:
+
+    Aws::String m_key;
+    bool m_keyHasBeenSet = false;
+
+    Aws::String m_value;
+    bool m_valueHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceRequest.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceRequest.h
new file mode 100644
index 00000000000..41716b4c73a
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceRequest.h
@@ -0,0 +1,139 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/cur/CostandUsageReportServiceRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/cur/model/Tag.h>
+#include <utility>
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+  /**
+   */
+  class TagResourceRequest : public CostandUsageReportServiceRequest
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API TagResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "TagResource"; }
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::String SerializePayload() const override;
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
+
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline const Aws::String& GetReportName() const{ return m_reportName; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline bool ReportNameHasBeenSet() const { return m_reportNameHasBeenSet; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline void SetReportName(const Aws::String& value) { m_reportNameHasBeenSet = true; m_reportName = value; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline void SetReportName(Aws::String&& value) { m_reportNameHasBeenSet = true; m_reportName = std::move(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline void SetReportName(const char* value) { m_reportNameHasBeenSet = true; m_reportName.assign(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline TagResourceRequest& WithReportName(const Aws::String& value) { SetReportName(value); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline TagResourceRequest& WithReportName(Aws::String&& value) { SetReportName(std::move(value)); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be associated
+     * with.</p>
+     */
+    inline TagResourceRequest& WithReportName(const char* value) { SetReportName(value); return *this;}
+
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline const Aws::Vector<Tag>& GetTags() const{ return m_tags; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline bool TagsHasBeenSet() const { return m_tagsHasBeenSet; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline void SetTags(const Aws::Vector<Tag>& value) { m_tagsHasBeenSet = true; m_tags = value; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline void SetTags(Aws::Vector<Tag>&& value) { m_tagsHasBeenSet = true; m_tags = std::move(value); }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline TagResourceRequest& WithTags(const Aws::Vector<Tag>& value) { SetTags(value); return *this;}
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline TagResourceRequest& WithTags(Aws::Vector<Tag>&& value) { SetTags(std::move(value)); return *this;}
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline TagResourceRequest& AddTags(const Tag& value) { m_tagsHasBeenSet = true; m_tags.push_back(value); return *this; }
+
+    /**
+     * <p>The tags to be assigned to the report definition resource.</p>
+     */
+    inline TagResourceRequest& AddTags(Tag&& value) { m_tagsHasBeenSet = true; m_tags.push_back(std::move(value)); return *this; }
+
+  private:
+
+    Aws::String m_reportName;
+    bool m_reportNameHasBeenSet = false;
+
+    Aws::Vector<Tag> m_tags;
+    bool m_tagsHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceResult.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceResult.h
new file mode 100644
index 00000000000..8dd309da639
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/TagResourceResult.h
@@ -0,0 +1,63 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CostandUsageReportService
+{
+namespace Model
+{
+  class TagResourceResult
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API TagResourceResult();
+    AWS_COSTANDUSAGEREPORTSERVICE_API TagResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_COSTANDUSAGEREPORTSERVICE_API TagResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline TagResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline TagResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline TagResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceRequest.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceRequest.h
new file mode 100644
index 00000000000..0df11a9af0d
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceRequest.h
@@ -0,0 +1,143 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/cur/CostandUsageReportServiceRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <utility>
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+  /**
+   */
+  class UntagResourceRequest : public CostandUsageReportServiceRequest
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API UntagResourceRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "UntagResource"; }
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::String SerializePayload() const override;
+
+    AWS_COSTANDUSAGEREPORTSERVICE_API Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
+
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline const Aws::String& GetReportName() const{ return m_reportName; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline bool ReportNameHasBeenSet() const { return m_reportNameHasBeenSet; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline void SetReportName(const Aws::String& value) { m_reportNameHasBeenSet = true; m_reportName = value; }
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline void SetReportName(Aws::String&& value) { m_reportNameHasBeenSet = true; m_reportName = std::move(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline void SetReportName(const char* value) { m_reportNameHasBeenSet = true; m_reportName.assign(value); }
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline UntagResourceRequest& WithReportName(const Aws::String& value) { SetReportName(value); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline UntagResourceRequest& WithReportName(Aws::String&& value) { SetReportName(std::move(value)); return *this;}
+
+    /**
+     * <p>The report name of the report definition that tags are to be disassociated
+     * from.</p>
+     */
+    inline UntagResourceRequest& WithReportName(const char* value) { SetReportName(value); return *this;}
+
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetTagKeys() const{ return m_tagKeys; }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline bool TagKeysHasBeenSet() const { return m_tagKeysHasBeenSet; }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline void SetTagKeys(const Aws::Vector<Aws::String>& value) { m_tagKeysHasBeenSet = true; m_tagKeys = value; }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline void SetTagKeys(Aws::Vector<Aws::String>&& value) { m_tagKeysHasBeenSet = true; m_tagKeys = std::move(value); }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline UntagResourceRequest& WithTagKeys(const Aws::Vector<Aws::String>& value) { SetTagKeys(value); return *this;}
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline UntagResourceRequest& WithTagKeys(Aws::Vector<Aws::String>&& value) { SetTagKeys(std::move(value)); return *this;}
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(const Aws::String& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(Aws::String&& value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(std::move(value)); return *this; }
+
+    /**
+     * <p>The tags to be disassociated from the report definition resource.</p>
+     */
+    inline UntagResourceRequest& AddTagKeys(const char* value) { m_tagKeysHasBeenSet = true; m_tagKeys.push_back(value); return *this; }
+
+  private:
+
+    Aws::String m_reportName;
+    bool m_reportNameHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_tagKeys;
+    bool m_tagKeysHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceResult.h b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceResult.h
new file mode 100644
index 00000000000..b87be28bc0f
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/include/aws/cur/model/UntagResourceResult.h
@@ -0,0 +1,63 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace CostandUsageReportService
+{
+namespace Model
+{
+  class UntagResourceResult
+  {
+  public:
+    AWS_COSTANDUSAGEREPORTSERVICE_API UntagResourceResult();
+    AWS_COSTANDUSAGEREPORTSERVICE_API UntagResourceResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_COSTANDUSAGEREPORTSERVICE_API UntagResourceResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+
+    
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+
+    
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+
+    
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+
+    
+    inline UntagResourceResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+
+    
+    inline UntagResourceResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+
+    
+    inline UntagResourceResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+
+  private:
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceClient.cpp b/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceClient.cpp
index 0a354a8cc1a..a819f4abb7b 100644
--- a/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceClient.cpp
+++ b/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceClient.cpp
@@ -23,8 +23,11 @@
 #include <aws/cur/CostandUsageReportServiceEndpointProvider.h>
 #include <aws/cur/model/DeleteReportDefinitionRequest.h>
 #include <aws/cur/model/DescribeReportDefinitionsRequest.h>
+#include <aws/cur/model/ListTagsForResourceRequest.h>
 #include <aws/cur/model/ModifyReportDefinitionRequest.h>
 #include <aws/cur/model/PutReportDefinitionRequest.h>
+#include <aws/cur/model/TagResourceRequest.h>
+#include <aws/cur/model/UntagResourceRequest.h>
 
 #include <smithy/tracing/TracingUtils.h>
 
@@ -210,6 +213,32 @@ DescribeReportDefinitionsOutcome CostandUsageReportServiceClient::DescribeReport
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+ListTagsForResourceOutcome CostandUsageReportServiceClient::ListTagsForResource(const ListTagsForResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(ListTagsForResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ListTagsForResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ListTagsForResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, ListTagsForResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ListTagsForResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<ListTagsForResourceOutcome>(
+    [&]()-> ListTagsForResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ListTagsForResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      return ListTagsForResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 ModifyReportDefinitionOutcome CostandUsageReportServiceClient::ModifyReportDefinition(const ModifyReportDefinitionRequest& request) const
 {
   AWS_OPERATION_GUARD(ModifyReportDefinition);
@@ -262,3 +291,55 @@ PutReportDefinitionOutcome CostandUsageReportServiceClient::PutReportDefinition(
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+TagResourceOutcome CostandUsageReportServiceClient::TagResource(const TagResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(TagResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, TagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, TagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, TagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".TagResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<TagResourceOutcome>(
+    [&]()-> TagResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, TagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      return TagResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
+UntagResourceOutcome CostandUsageReportServiceClient::UntagResource(const UntagResourceRequest& request) const
+{
+  AWS_OPERATION_GUARD(UntagResource);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UntagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UntagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UntagResource, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UntagResource",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UntagResourceOutcome>(
+    [&]()-> UntagResourceOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UntagResource, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      return UntagResourceOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
diff --git a/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceEndpointRules.cpp b/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceEndpointRules.cpp
index a3a18b27d23..067b71e71ec 100644
--- a/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-cur/source/CostandUsageReportServiceEndpointRules.cpp
@@ -51,106 +51,106 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','u','r','-',
-'f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}',
-'"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r',
-'s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
-'r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r',
-'e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i',
-'t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',
-' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
-'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
-'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
-'t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c',
-'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
-'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
-'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
-'p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"',
-'t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':',
-'"','h','t','t','p','s',':','/','/','c','u','r','-','f','i','p','s','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
-'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
-'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
-'n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
-'e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e',
-'r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
 '"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
 'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
-'}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
+'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
 'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
 'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
 '"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
 'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c',
-'k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
-'c','u','r','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e',
-'s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',
-',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s',
-'"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',
-'}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r',
-'"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p',
-'e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n',
-'s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"',
-'h','t','t','p','s',':','/','/','c','u','r','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','u','r','-','f','i','p','s','.','{',
+'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
+'d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o',
+'p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',
+',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p',
+'e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
+'[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l',
+'S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h',
+'i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p',
+'p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
+'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f',
+'"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l',
+'e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',
+':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[',
+'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
+'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
+'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']','}',']',',',
+'"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',
+',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',
+':','/','/','c','u','r','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
 't','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',',
 '"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
+':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
+'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e',
+'n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"',
+'t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t',
+'r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
+'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
+'[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t',
+'r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i',
+'o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l',
+'s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e',
+'t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a',
+'r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s',
+'D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n',
+'t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','u','r','.','{','R',
+'e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d',
+'u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p',
+'e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',',
+'"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e',
+'"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
+']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e',
+'n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a',
+'c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p',
+'e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
+'[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t',
+'p','s',':','/','/','c','u','r','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r',
+'o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}',
+'}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
 'r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',
 ':',' ','M','i','s','s','i','n','g',' ','R','e','g','i','o','n','"',',','"','t','y','p','e','"',':',
 '"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/LastStatus.cpp b/generated/src/aws-cpp-sdk-cur/source/model/LastStatus.cpp
new file mode 100644
index 00000000000..f3a9107713f
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/LastStatus.cpp
@@ -0,0 +1,79 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/LastStatus.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace CostandUsageReportService
+  {
+    namespace Model
+    {
+      namespace LastStatusMapper
+      {
+
+        static const int SUCCESS_HASH = HashingUtils::HashString("SUCCESS");
+        static const int ERROR_PERMISSIONS_HASH = HashingUtils::HashString("ERROR_PERMISSIONS");
+        static const int ERROR_NO_BUCKET_HASH = HashingUtils::HashString("ERROR_NO_BUCKET");
+
+
+        LastStatus GetLastStatusForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == SUCCESS_HASH)
+          {
+            return LastStatus::SUCCESS;
+          }
+          else if (hashCode == ERROR_PERMISSIONS_HASH)
+          {
+            return LastStatus::ERROR_PERMISSIONS;
+          }
+          else if (hashCode == ERROR_NO_BUCKET_HASH)
+          {
+            return LastStatus::ERROR_NO_BUCKET;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<LastStatus>(hashCode);
+          }
+
+          return LastStatus::NOT_SET;
+        }
+
+        Aws::String GetNameForLastStatus(LastStatus enumValue)
+        {
+          switch(enumValue)
+          {
+          case LastStatus::NOT_SET:
+            return {};
+          case LastStatus::SUCCESS:
+            return "SUCCESS";
+          case LastStatus::ERROR_PERMISSIONS:
+            return "ERROR_PERMISSIONS";
+          case LastStatus::ERROR_NO_BUCKET:
+            return "ERROR_NO_BUCKET";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace LastStatusMapper
+    } // namespace Model
+  } // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceRequest.cpp b/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceRequest.cpp
new file mode 100644
index 00000000000..6a5cc976521
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceRequest.cpp
@@ -0,0 +1,43 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/ListTagsForResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+ListTagsForResourceRequest::ListTagsForResourceRequest() : 
+    m_reportNameHasBeenSet(false)
+{
+}
+
+Aws::String ListTagsForResourceRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_reportNameHasBeenSet)
+  {
+   payload.WithString("ReportName", m_reportName);
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+Aws::Http::HeaderValueCollection ListTagsForResourceRequest::GetRequestSpecificHeaders() const
+{
+  Aws::Http::HeaderValueCollection headers;
+  headers.insert(Aws::Http::HeaderValuePair("X-Amz-Target", "AWSOrigamiServiceGatewayService.ListTagsForResource"));
+  return headers;
+
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceResult.cpp b/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceResult.cpp
new file mode 100644
index 00000000000..60d17e72b50
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/ListTagsForResourceResult.cpp
@@ -0,0 +1,51 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/ListTagsForResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListTagsForResourceResult::ListTagsForResourceResult()
+{
+}
+
+ListTagsForResourceResult::ListTagsForResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListTagsForResourceResult& ListTagsForResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("Tags"))
+  {
+    Aws::Utils::Array<JsonView> tagsJsonList = jsonValue.GetArray("Tags");
+    for(unsigned tagsIndex = 0; tagsIndex < tagsJsonList.GetLength(); ++tagsIndex)
+    {
+      m_tags.push_back(tagsJsonList[tagsIndex].AsObject());
+    }
+  }
+
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/PutReportDefinitionRequest.cpp b/generated/src/aws-cpp-sdk-cur/source/model/PutReportDefinitionRequest.cpp
index 63822a04276..86b6b1a220d 100644
--- a/generated/src/aws-cpp-sdk-cur/source/model/PutReportDefinitionRequest.cpp
+++ b/generated/src/aws-cpp-sdk-cur/source/model/PutReportDefinitionRequest.cpp
@@ -13,7 +13,8 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 PutReportDefinitionRequest::PutReportDefinitionRequest() : 
-    m_reportDefinitionHasBeenSet(false)
+    m_reportDefinitionHasBeenSet(false),
+    m_tagsHasBeenSet(false)
 {
 }
 
@@ -27,6 +28,17 @@ Aws::String PutReportDefinitionRequest::SerializePayload() const
 
   }
 
+  if(m_tagsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> tagsJsonList(m_tags.size());
+   for(unsigned tagsIndex = 0; tagsIndex < tagsJsonList.GetLength(); ++tagsIndex)
+   {
+     tagsJsonList[tagsIndex].AsObject(m_tags[tagsIndex].Jsonize());
+   }
+   payload.WithArray("Tags", std::move(tagsJsonList));
+
+  }
+
   return payload.View().WriteReadable();
 }
 
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/ReportDefinition.cpp b/generated/src/aws-cpp-sdk-cur/source/model/ReportDefinition.cpp
index 01c5fafc270..92f5be35b19 100644
--- a/generated/src/aws-cpp-sdk-cur/source/model/ReportDefinition.cpp
+++ b/generated/src/aws-cpp-sdk-cur/source/model/ReportDefinition.cpp
@@ -36,7 +36,8 @@ ReportDefinition::ReportDefinition() :
     m_refreshClosedReportsHasBeenSet(false),
     m_reportVersioning(ReportVersioning::NOT_SET),
     m_reportVersioningHasBeenSet(false),
-    m_billingViewArnHasBeenSet(false)
+    m_billingViewArnHasBeenSet(false),
+    m_reportStatusHasBeenSet(false)
 {
 }
 
@@ -58,7 +59,8 @@ ReportDefinition::ReportDefinition(JsonView jsonValue) :
     m_refreshClosedReportsHasBeenSet(false),
     m_reportVersioning(ReportVersioning::NOT_SET),
     m_reportVersioningHasBeenSet(false),
-    m_billingViewArnHasBeenSet(false)
+    m_billingViewArnHasBeenSet(false),
+    m_reportStatusHasBeenSet(false)
 {
   *this = jsonValue;
 }
@@ -155,6 +157,13 @@ ReportDefinition& ReportDefinition::operator =(JsonView jsonValue)
     m_billingViewArnHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("ReportStatus"))
+  {
+    m_reportStatus = jsonValue.GetObject("ReportStatus");
+
+    m_reportStatusHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -239,6 +248,12 @@ JsonValue ReportDefinition::Jsonize() const
 
   }
 
+  if(m_reportStatusHasBeenSet)
+  {
+   payload.WithObject("ReportStatus", m_reportStatus.Jsonize());
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/ReportStatus.cpp b/generated/src/aws-cpp-sdk-cur/source/model/ReportStatus.cpp
new file mode 100644
index 00000000000..97ebd596948
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/ReportStatus.cpp
@@ -0,0 +1,75 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/ReportStatus.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+ReportStatus::ReportStatus() : 
+    m_lastDeliveryHasBeenSet(false),
+    m_lastStatus(LastStatus::NOT_SET),
+    m_lastStatusHasBeenSet(false)
+{
+}
+
+ReportStatus::ReportStatus(JsonView jsonValue) : 
+    m_lastDeliveryHasBeenSet(false),
+    m_lastStatus(LastStatus::NOT_SET),
+    m_lastStatusHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+ReportStatus& ReportStatus::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("lastDelivery"))
+  {
+    m_lastDelivery = jsonValue.GetString("lastDelivery");
+
+    m_lastDeliveryHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("lastStatus"))
+  {
+    m_lastStatus = LastStatusMapper::GetLastStatusForName(jsonValue.GetString("lastStatus"));
+
+    m_lastStatusHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue ReportStatus::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_lastDeliveryHasBeenSet)
+  {
+   payload.WithString("lastDelivery", m_lastDelivery);
+
+  }
+
+  if(m_lastStatusHasBeenSet)
+  {
+   payload.WithString("lastStatus", LastStatusMapper::GetNameForLastStatus(m_lastStatus));
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/SchemaElement.cpp b/generated/src/aws-cpp-sdk-cur/source/model/SchemaElement.cpp
index 0d278426ec4..5231e0c5b9e 100644
--- a/generated/src/aws-cpp-sdk-cur/source/model/SchemaElement.cpp
+++ b/generated/src/aws-cpp-sdk-cur/source/model/SchemaElement.cpp
@@ -22,6 +22,7 @@ namespace Aws
 
         static const int RESOURCES_HASH = HashingUtils::HashString("RESOURCES");
         static const int SPLIT_COST_ALLOCATION_DATA_HASH = HashingUtils::HashString("SPLIT_COST_ALLOCATION_DATA");
+        static const int MANUAL_DISCOUNT_COMPATIBILITY_HASH = HashingUtils::HashString("MANUAL_DISCOUNT_COMPATIBILITY");
 
 
         SchemaElement GetSchemaElementForName(const Aws::String& name)
@@ -35,6 +36,10 @@ namespace Aws
           {
             return SchemaElement::SPLIT_COST_ALLOCATION_DATA;
           }
+          else if (hashCode == MANUAL_DISCOUNT_COMPATIBILITY_HASH)
+          {
+            return SchemaElement::MANUAL_DISCOUNT_COMPATIBILITY;
+          }
           EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
           if(overflowContainer)
           {
@@ -55,6 +60,8 @@ namespace Aws
             return "RESOURCES";
           case SchemaElement::SPLIT_COST_ALLOCATION_DATA:
             return "SPLIT_COST_ALLOCATION_DATA";
+          case SchemaElement::MANUAL_DISCOUNT_COMPATIBILITY:
+            return "MANUAL_DISCOUNT_COMPATIBILITY";
           default:
             EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
             if(overflowContainer)
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/Tag.cpp b/generated/src/aws-cpp-sdk-cur/source/model/Tag.cpp
new file mode 100644
index 00000000000..afde4cf30c5
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/Tag.cpp
@@ -0,0 +1,74 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/Tag.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace CostandUsageReportService
+{
+namespace Model
+{
+
+Tag::Tag() : 
+    m_keyHasBeenSet(false),
+    m_valueHasBeenSet(false)
+{
+}
+
+Tag::Tag(JsonView jsonValue) : 
+    m_keyHasBeenSet(false),
+    m_valueHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+Tag& Tag::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Key"))
+  {
+    m_key = jsonValue.GetString("Key");
+
+    m_keyHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Value"))
+  {
+    m_value = jsonValue.GetString("Value");
+
+    m_valueHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue Tag::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_keyHasBeenSet)
+  {
+   payload.WithString("Key", m_key);
+
+  }
+
+  if(m_valueHasBeenSet)
+  {
+   payload.WithString("Value", m_value);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace CostandUsageReportService
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/TagResourceRequest.cpp b/generated/src/aws-cpp-sdk-cur/source/model/TagResourceRequest.cpp
new file mode 100644
index 00000000000..0f4231102f5
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/TagResourceRequest.cpp
@@ -0,0 +1,55 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/TagResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+TagResourceRequest::TagResourceRequest() : 
+    m_reportNameHasBeenSet(false),
+    m_tagsHasBeenSet(false)
+{
+}
+
+Aws::String TagResourceRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_reportNameHasBeenSet)
+  {
+   payload.WithString("ReportName", m_reportName);
+
+  }
+
+  if(m_tagsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> tagsJsonList(m_tags.size());
+   for(unsigned tagsIndex = 0; tagsIndex < tagsJsonList.GetLength(); ++tagsIndex)
+   {
+     tagsJsonList[tagsIndex].AsObject(m_tags[tagsIndex].Jsonize());
+   }
+   payload.WithArray("Tags", std::move(tagsJsonList));
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+Aws::Http::HeaderValueCollection TagResourceRequest::GetRequestSpecificHeaders() const
+{
+  Aws::Http::HeaderValueCollection headers;
+  headers.insert(Aws::Http::HeaderValuePair("X-Amz-Target", "AWSOrigamiServiceGatewayService.TagResource"));
+  return headers;
+
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/TagResourceResult.cpp b/generated/src/aws-cpp-sdk-cur/source/model/TagResourceResult.cpp
new file mode 100644
index 00000000000..27d0472deb8
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/TagResourceResult.cpp
@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/TagResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+TagResourceResult::TagResourceResult()
+{
+}
+
+TagResourceResult::TagResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+TagResourceResult& TagResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  AWS_UNREFERENCED_PARAM(result);
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceRequest.cpp b/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceRequest.cpp
new file mode 100644
index 00000000000..cda2227eb8a
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceRequest.cpp
@@ -0,0 +1,55 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/UntagResourceRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+UntagResourceRequest::UntagResourceRequest() : 
+    m_reportNameHasBeenSet(false),
+    m_tagKeysHasBeenSet(false)
+{
+}
+
+Aws::String UntagResourceRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_reportNameHasBeenSet)
+  {
+   payload.WithString("ReportName", m_reportName);
+
+  }
+
+  if(m_tagKeysHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> tagKeysJsonList(m_tagKeys.size());
+   for(unsigned tagKeysIndex = 0; tagKeysIndex < tagKeysJsonList.GetLength(); ++tagKeysIndex)
+   {
+     tagKeysJsonList[tagKeysIndex].AsString(m_tagKeys[tagKeysIndex]);
+   }
+   payload.WithArray("TagKeys", std::move(tagKeysJsonList));
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+Aws::Http::HeaderValueCollection UntagResourceRequest::GetRequestSpecificHeaders() const
+{
+  Aws::Http::HeaderValueCollection headers;
+  headers.insert(Aws::Http::HeaderValuePair("X-Amz-Target", "AWSOrigamiServiceGatewayService.UntagResource"));
+  return headers;
+
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceResult.cpp b/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceResult.cpp
new file mode 100644
index 00000000000..c8aea88c0f4
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-cur/source/model/UntagResourceResult.cpp
@@ -0,0 +1,42 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/cur/model/UntagResourceResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::CostandUsageReportService::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+UntagResourceResult::UntagResourceResult()
+{
+}
+
+UntagResourceResult::UntagResourceResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+UntagResourceResult& UntagResourceResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  AWS_UNREFERENCED_PARAM(result);
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdSpecification.h
index 4066bebbfe0..c8ef3930544 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdSpecification.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdSpecification.h
@@ -24,8 +24,17 @@ namespace Model
 {
 
   /**
-   * <p>Describes the ENA Express configuration for the network interface that's
-   * attached to the instance.</p><p><h3>See Also:</h3>   <a
+   * <p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD)
+   * technology to increase the maximum bandwidth used per stream and minimize tail
+   * latency of network traffic between EC2 instances. With ENA Express, you can
+   * communicate between two EC2 instances in the same subnet within the same
+   * account, or in different accounts. Both sending and receiving instances must
+   * have ENA Express enabled.</p> <p>To improve the reliability of network packet
+   * delivery, ENA Express reorders network packets on the receiving end by default.
+   * However, some UDP-based applications are designed to handle network packets that
+   * are out of order to reduce the overhead for packet delivery at the network
+   * layer. When ENA Express is enabled, you can specify whether UDP network traffic
+   * uses it.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AttachmentEnaSrdSpecification">AWS
    * API Reference</a></p>
    */
@@ -41,57 +50,53 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether ENA Express is enabled for the network interface that's
-     * attached to the instance.</p>
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
      */
     inline bool GetEnaSrdEnabled() const{ return m_enaSrdEnabled; }
 
     /**
-     * <p>Indicates whether ENA Express is enabled for the network interface that's
-     * attached to the instance.</p>
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
      */
     inline bool EnaSrdEnabledHasBeenSet() const { return m_enaSrdEnabledHasBeenSet; }
 
     /**
-     * <p>Indicates whether ENA Express is enabled for the network interface that's
-     * attached to the instance.</p>
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
      */
     inline void SetEnaSrdEnabled(bool value) { m_enaSrdEnabledHasBeenSet = true; m_enaSrdEnabled = value; }
 
     /**
-     * <p>Indicates whether ENA Express is enabled for the network interface that's
-     * attached to the instance.</p>
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
      */
     inline AttachmentEnaSrdSpecification& WithEnaSrdEnabled(bool value) { SetEnaSrdEnabled(value); return *this;}
 
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline const AttachmentEnaSrdUdpSpecification& GetEnaSrdUdpSpecification() const{ return m_enaSrdUdpSpecification; }
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline bool EnaSrdUdpSpecificationHasBeenSet() const { return m_enaSrdUdpSpecificationHasBeenSet; }
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline void SetEnaSrdUdpSpecification(const AttachmentEnaSrdUdpSpecification& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = value; }
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline void SetEnaSrdUdpSpecification(AttachmentEnaSrdUdpSpecification&& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = std::move(value); }
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline AttachmentEnaSrdSpecification& WithEnaSrdUdpSpecification(const AttachmentEnaSrdUdpSpecification& value) { SetEnaSrdUdpSpecification(value); return *this;}
 
     /**
-     * <p>ENA Express configuration for UDP network traffic.</p>
+     * <p>Configures ENA Express for UDP network traffic.</p>
      */
     inline AttachmentEnaSrdSpecification& WithEnaSrdUdpSpecification(AttachmentEnaSrdUdpSpecification&& value) { SetEnaSrdUdpSpecification(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdUdpSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdUdpSpecification.h
index 621b95515f8..37219a6b656 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdUdpSpecification.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/AttachmentEnaSrdUdpSpecification.h
@@ -22,8 +22,13 @@ namespace Model
 {
 
   /**
-   * <p>Describes the ENA Express configuration for UDP traffic on the network
-   * interface that's attached to the instance.</p><p><h3>See Also:</h3>   <a
+   * <p>ENA Express is compatible with both TCP and UDP transport protocols. When
+   * it's enabled, TCP traffic automatically uses it. However, some UDP-based
+   * applications are designed to handle network packets that are out of order,
+   * without a need for retransmission, such as live video broadcasting or other
+   * near-real-time applications. For UDP traffic, you can specify whether to use ENA
+   * Express, based on your application environment needs.</p><p><h3>See Also:</h3>  
+   * <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AttachmentEnaSrdUdpSpecification">AWS
    * API Reference</a></p>
    */
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/DescribeInstancesRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/DescribeInstancesRequest.h
index e17f25e772f..f518979efab 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/DescribeInstancesRequest.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/DescribeInstancesRequest.h
@@ -92,9 +92,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -385,9 +386,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -678,9 +680,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -971,9 +974,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -1264,9 +1268,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -1557,9 +1562,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -1850,9 +1856,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
@@ -2143,9 +2150,10 @@ namespace Model
      * the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> -
      * The ID of the image used to launch the instance.</p> </li> <li> <p>
      * <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p>
-     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a
-     * Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li>
-     * <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit
+     * <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a
+     * Scheduled Instance, or a Capacity Block (<code>spot</code> |
+     * <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p>
+     * <code>instance-state-code</code> - The state of the instance, as a 16-bit
      * unsigned integer. The high byte is used for internal purposes and should be
      * ignored. The low byte is set based on the state represented. The valid values
      * are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdSpecificationRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdSpecificationRequest.h
new file mode 100644
index 00000000000..c42452c813b
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdSpecificationRequest.h
@@ -0,0 +1,115 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+#include <aws/ec2/model/EnaSrdUdpSpecificationRequest.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>Launch instances with ENA Express settings configured from your launch
+   * template.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EnaSrdSpecificationRequest">AWS
+   * API Reference</a></p>
+   */
+  class EnaSrdSpecificationRequest
+  {
+  public:
+    AWS_EC2_API EnaSrdSpecificationRequest();
+    AWS_EC2_API EnaSrdSpecificationRequest(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API EnaSrdSpecificationRequest& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Specifies whether ENA Express is enabled for the network interface when you
+     * launch an instance from your launch template.</p>
+     */
+    inline bool GetEnaSrdEnabled() const{ return m_enaSrdEnabled; }
+
+    /**
+     * <p>Specifies whether ENA Express is enabled for the network interface when you
+     * launch an instance from your launch template.</p>
+     */
+    inline bool EnaSrdEnabledHasBeenSet() const { return m_enaSrdEnabledHasBeenSet; }
+
+    /**
+     * <p>Specifies whether ENA Express is enabled for the network interface when you
+     * launch an instance from your launch template.</p>
+     */
+    inline void SetEnaSrdEnabled(bool value) { m_enaSrdEnabledHasBeenSet = true; m_enaSrdEnabled = value; }
+
+    /**
+     * <p>Specifies whether ENA Express is enabled for the network interface when you
+     * launch an instance from your launch template.</p>
+     */
+    inline EnaSrdSpecificationRequest& WithEnaSrdEnabled(bool value) { SetEnaSrdEnabled(value); return *this;}
+
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline const EnaSrdUdpSpecificationRequest& GetEnaSrdUdpSpecification() const{ return m_enaSrdUdpSpecification; }
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline bool EnaSrdUdpSpecificationHasBeenSet() const { return m_enaSrdUdpSpecificationHasBeenSet; }
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(const EnaSrdUdpSpecificationRequest& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = value; }
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(EnaSrdUdpSpecificationRequest&& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = std::move(value); }
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline EnaSrdSpecificationRequest& WithEnaSrdUdpSpecification(const EnaSrdUdpSpecificationRequest& value) { SetEnaSrdUdpSpecification(value); return *this;}
+
+    /**
+     * <p>Contains ENA Express settings for UDP network traffic in your launch
+     * template.</p>
+     */
+    inline EnaSrdSpecificationRequest& WithEnaSrdUdpSpecification(EnaSrdUdpSpecificationRequest&& value) { SetEnaSrdUdpSpecification(std::move(value)); return *this;}
+
+  private:
+
+    bool m_enaSrdEnabled;
+    bool m_enaSrdEnabledHasBeenSet = false;
+
+    EnaSrdUdpSpecificationRequest m_enaSrdUdpSpecification;
+    bool m_enaSrdUdpSpecificationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecification.h
index 253b6e6b2a9..0a9f501c79a 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecification.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecification.h
@@ -23,7 +23,7 @@ namespace Model
 
   /**
    * <p>ENA Express is compatible with both TCP and UDP transport protocols. When
-   * it’s enabled, TCP traffic automatically uses it. However, some UDP-based
+   * it's enabled, TCP traffic automatically uses it. However, some UDP-based
    * applications are designed to handle network packets that are out of order,
    * without a need for retransmission, such as live video broadcasting or other
    * near-real-time applications. For UDP traffic, you can specify whether to use ENA
@@ -44,26 +44,26 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether UDP traffic uses ENA Express. To specify this setting, you
-     * must first enable ENA Express.</p>
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
      */
     inline bool GetEnaSrdUdpEnabled() const{ return m_enaSrdUdpEnabled; }
 
     /**
-     * <p>Indicates whether UDP traffic uses ENA Express. To specify this setting, you
-     * must first enable ENA Express.</p>
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
      */
     inline bool EnaSrdUdpEnabledHasBeenSet() const { return m_enaSrdUdpEnabledHasBeenSet; }
 
     /**
-     * <p>Indicates whether UDP traffic uses ENA Express. To specify this setting, you
-     * must first enable ENA Express.</p>
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
      */
     inline void SetEnaSrdUdpEnabled(bool value) { m_enaSrdUdpEnabledHasBeenSet = true; m_enaSrdUdpEnabled = value; }
 
     /**
-     * <p>Indicates whether UDP traffic uses ENA Express. To specify this setting, you
-     * must first enable ENA Express.</p>
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
      */
     inline EnaSrdUdpSpecification& WithEnaSrdUdpEnabled(bool value) { SetEnaSrdUdpEnabled(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecificationRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecificationRequest.h
new file mode 100644
index 00000000000..39166b4b6c3
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/EnaSrdUdpSpecificationRequest.h
@@ -0,0 +1,81 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>Configures ENA Express for UDP network traffic from your launch
+   * template.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EnaSrdUdpSpecificationRequest">AWS
+   * API Reference</a></p>
+   */
+  class EnaSrdUdpSpecificationRequest
+  {
+  public:
+    AWS_EC2_API EnaSrdUdpSpecificationRequest();
+    AWS_EC2_API EnaSrdUdpSpecificationRequest(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API EnaSrdUdpSpecificationRequest& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Indicates whether UDP traffic uses ENA Express for your instance. To ensure
+     * that UDP traffic can use ENA Express when you launch an instance, you must also
+     * set <b>EnaSrdEnabled</b> in the <b>EnaSrdSpecificationRequest</b> to
+     * <code>true</code> in your launch template.</p>
+     */
+    inline bool GetEnaSrdUdpEnabled() const{ return m_enaSrdUdpEnabled; }
+
+    /**
+     * <p>Indicates whether UDP traffic uses ENA Express for your instance. To ensure
+     * that UDP traffic can use ENA Express when you launch an instance, you must also
+     * set <b>EnaSrdEnabled</b> in the <b>EnaSrdSpecificationRequest</b> to
+     * <code>true</code> in your launch template.</p>
+     */
+    inline bool EnaSrdUdpEnabledHasBeenSet() const { return m_enaSrdUdpEnabledHasBeenSet; }
+
+    /**
+     * <p>Indicates whether UDP traffic uses ENA Express for your instance. To ensure
+     * that UDP traffic can use ENA Express when you launch an instance, you must also
+     * set <b>EnaSrdEnabled</b> in the <b>EnaSrdSpecificationRequest</b> to
+     * <code>true</code> in your launch template.</p>
+     */
+    inline void SetEnaSrdUdpEnabled(bool value) { m_enaSrdUdpEnabledHasBeenSet = true; m_enaSrdUdpEnabled = value; }
+
+    /**
+     * <p>Indicates whether UDP traffic uses ENA Express for your instance. To ensure
+     * that UDP traffic can use ENA Express when you launch an instance, you must also
+     * set <b>EnaSrdEnabled</b> in the <b>EnaSrdSpecificationRequest</b> to
+     * <code>true</code> in your launch template.</p>
+     */
+    inline EnaSrdUdpSpecificationRequest& WithEnaSrdUdpEnabled(bool value) { SetEnaSrdUdpEnabled(value); return *this;}
+
+  private:
+
+    bool m_enaSrdUdpEnabled;
+    bool m_enaSrdUdpEnabledHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdSpecification.h
new file mode 100644
index 00000000000..46f6c289524
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdSpecification.h
@@ -0,0 +1,114 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+#include <aws/ec2/model/InstanceAttachmentEnaSrdUdpSpecification.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD)
+   * technology to increase the maximum bandwidth used per stream and minimize tail
+   * latency of network traffic between EC2 instances. With ENA Express, you can
+   * communicate between two EC2 instances in the same subnet within the same
+   * account, or in different accounts. Both sending and receiving instances must
+   * have ENA Express enabled.</p> <p>To improve the reliability of network packet
+   * delivery, ENA Express reorders network packets on the receiving end by default.
+   * However, some UDP-based applications are designed to handle network packets that
+   * are out of order to reduce the overhead for packet delivery at the network
+   * layer. When ENA Express is enabled, you can specify whether UDP network traffic
+   * uses it.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceAttachmentEnaSrdSpecification">AWS
+   * API Reference</a></p>
+   */
+  class InstanceAttachmentEnaSrdSpecification
+  {
+  public:
+    AWS_EC2_API InstanceAttachmentEnaSrdSpecification();
+    AWS_EC2_API InstanceAttachmentEnaSrdSpecification(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API InstanceAttachmentEnaSrdSpecification& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline bool GetEnaSrdEnabled() const{ return m_enaSrdEnabled; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline bool EnaSrdEnabledHasBeenSet() const { return m_enaSrdEnabledHasBeenSet; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline void SetEnaSrdEnabled(bool value) { m_enaSrdEnabledHasBeenSet = true; m_enaSrdEnabled = value; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline InstanceAttachmentEnaSrdSpecification& WithEnaSrdEnabled(bool value) { SetEnaSrdEnabled(value); return *this;}
+
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline const InstanceAttachmentEnaSrdUdpSpecification& GetEnaSrdUdpSpecification() const{ return m_enaSrdUdpSpecification; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline bool EnaSrdUdpSpecificationHasBeenSet() const { return m_enaSrdUdpSpecificationHasBeenSet; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(const InstanceAttachmentEnaSrdUdpSpecification& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = value; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(InstanceAttachmentEnaSrdUdpSpecification&& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = std::move(value); }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline InstanceAttachmentEnaSrdSpecification& WithEnaSrdUdpSpecification(const InstanceAttachmentEnaSrdUdpSpecification& value) { SetEnaSrdUdpSpecification(value); return *this;}
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline InstanceAttachmentEnaSrdSpecification& WithEnaSrdUdpSpecification(InstanceAttachmentEnaSrdUdpSpecification&& value) { SetEnaSrdUdpSpecification(std::move(value)); return *this;}
+
+  private:
+
+    bool m_enaSrdEnabled;
+    bool m_enaSrdEnabledHasBeenSet = false;
+
+    InstanceAttachmentEnaSrdUdpSpecification m_enaSrdUdpSpecification;
+    bool m_enaSrdUdpSpecificationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdUdpSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdUdpSpecification.h
new file mode 100644
index 00000000000..5f34861a503
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceAttachmentEnaSrdUdpSpecification.h
@@ -0,0 +1,78 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>ENA Express is compatible with both TCP and UDP transport protocols. When
+   * it's enabled, TCP traffic automatically uses it. However, some UDP-based
+   * applications are designed to handle network packets that are out of order,
+   * without a need for retransmission, such as live video broadcasting or other
+   * near-real-time applications. For UDP traffic, you can specify whether to use ENA
+   * Express, based on your application environment needs.</p><p><h3>See Also:</h3>  
+   * <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceAttachmentEnaSrdUdpSpecification">AWS
+   * API Reference</a></p>
+   */
+  class InstanceAttachmentEnaSrdUdpSpecification
+  {
+  public:
+    AWS_EC2_API InstanceAttachmentEnaSrdUdpSpecification();
+    AWS_EC2_API InstanceAttachmentEnaSrdUdpSpecification(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API InstanceAttachmentEnaSrdUdpSpecification& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline bool GetEnaSrdUdpEnabled() const{ return m_enaSrdUdpEnabled; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline bool EnaSrdUdpEnabledHasBeenSet() const { return m_enaSrdUdpEnabledHasBeenSet; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline void SetEnaSrdUdpEnabled(bool value) { m_enaSrdUdpEnabledHasBeenSet = true; m_enaSrdUdpEnabled = value; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline InstanceAttachmentEnaSrdUdpSpecification& WithEnaSrdUdpEnabled(bool value) { SetEnaSrdUdpEnabled(value); return *this;}
+
+  private:
+
+    bool m_enaSrdUdpEnabled;
+    bool m_enaSrdUdpEnabledHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceAttachment.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceAttachment.h
index 4df7e87db95..4ce6a592321 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceAttachment.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceAttachment.h
@@ -9,6 +9,7 @@
 #include <aws/core/utils/DateTime.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/ec2/model/AttachmentStatus.h>
+#include <aws/ec2/model/InstanceAttachmentEnaSrdSpecification.h>
 #include <utility>
 
 namespace Aws
@@ -214,6 +215,43 @@ namespace Model
      */
     inline InstanceNetworkInterfaceAttachment& WithNetworkCardIndex(int value) { SetNetworkCardIndex(value); return *this;}
 
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline const InstanceAttachmentEnaSrdSpecification& GetEnaSrdSpecification() const{ return m_enaSrdSpecification; }
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline bool EnaSrdSpecificationHasBeenSet() const { return m_enaSrdSpecificationHasBeenSet; }
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline void SetEnaSrdSpecification(const InstanceAttachmentEnaSrdSpecification& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = value; }
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline void SetEnaSrdSpecification(InstanceAttachmentEnaSrdSpecification&& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = std::move(value); }
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline InstanceNetworkInterfaceAttachment& WithEnaSrdSpecification(const InstanceAttachmentEnaSrdSpecification& value) { SetEnaSrdSpecification(value); return *this;}
+
+    /**
+     * <p>Contains the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline InstanceNetworkInterfaceAttachment& WithEnaSrdSpecification(InstanceAttachmentEnaSrdSpecification&& value) { SetEnaSrdSpecification(std::move(value)); return *this;}
+
   private:
 
     Aws::Utils::DateTime m_attachTime;
@@ -233,6 +271,9 @@ namespace Model
 
     int m_networkCardIndex;
     bool m_networkCardIndexHasBeenSet = false;
+
+    InstanceAttachmentEnaSrdSpecification m_enaSrdSpecification;
+    bool m_enaSrdSpecificationHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceSpecification.h
index 35b81ad7ba8..5cbd111a87f 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceSpecification.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceNetworkInterfaceSpecification.h
@@ -8,6 +8,7 @@
 #include <aws/core/utils/memory/stl/AWSStreamFwd.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/ec2/model/EnaSrdSpecificationRequest.h>
 #include <aws/ec2/model/InstanceIpv6Address.h>
 #include <aws/ec2/model/PrivateIpAddressSpecification.h>
 #include <aws/ec2/model/Ipv4PrefixSpecificationRequest.h>
@@ -969,6 +970,43 @@ namespace Model
      */
     inline InstanceNetworkInterfaceSpecification& WithPrimaryIpv6(bool value) { SetPrimaryIpv6(value); return *this;}
 
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline const EnaSrdSpecificationRequest& GetEnaSrdSpecification() const{ return m_enaSrdSpecification; }
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline bool EnaSrdSpecificationHasBeenSet() const { return m_enaSrdSpecificationHasBeenSet; }
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline void SetEnaSrdSpecification(const EnaSrdSpecificationRequest& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = value; }
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline void SetEnaSrdSpecification(EnaSrdSpecificationRequest&& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = std::move(value); }
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline InstanceNetworkInterfaceSpecification& WithEnaSrdSpecification(const EnaSrdSpecificationRequest& value) { SetEnaSrdSpecification(value); return *this;}
+
+    /**
+     * <p>Specifies the ENA Express settings for the network interface that's attached
+     * to the instance.</p>
+     */
+    inline InstanceNetworkInterfaceSpecification& WithEnaSrdSpecification(EnaSrdSpecificationRequest&& value) { SetEnaSrdSpecification(std::move(value)); return *this;}
+
   private:
 
     bool m_associatePublicIpAddress;
@@ -1030,6 +1068,9 @@ namespace Model
 
     bool m_primaryIpv6;
     bool m_primaryIpv6HasBeenSet = false;
+
+    EnaSrdSpecificationRequest m_enaSrdSpecification;
+    bool m_enaSrdSpecificationHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdSpecification.h
new file mode 100644
index 00000000000..88f725d2df3
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdSpecification.h
@@ -0,0 +1,114 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+#include <aws/ec2/model/LaunchTemplateEnaSrdUdpSpecification.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD)
+   * technology to increase the maximum bandwidth used per stream and minimize tail
+   * latency of network traffic between EC2 instances. With ENA Express, you can
+   * communicate between two EC2 instances in the same subnet within the same
+   * account, or in different accounts. Both sending and receiving instances must
+   * have ENA Express enabled.</p> <p>To improve the reliability of network packet
+   * delivery, ENA Express reorders network packets on the receiving end by default.
+   * However, some UDP-based applications are designed to handle network packets that
+   * are out of order to reduce the overhead for packet delivery at the network
+   * layer. When ENA Express is enabled, you can specify whether UDP network traffic
+   * uses it.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateEnaSrdSpecification">AWS
+   * API Reference</a></p>
+   */
+  class LaunchTemplateEnaSrdSpecification
+  {
+  public:
+    AWS_EC2_API LaunchTemplateEnaSrdSpecification();
+    AWS_EC2_API LaunchTemplateEnaSrdSpecification(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API LaunchTemplateEnaSrdSpecification& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline bool GetEnaSrdEnabled() const{ return m_enaSrdEnabled; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline bool EnaSrdEnabledHasBeenSet() const { return m_enaSrdEnabledHasBeenSet; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline void SetEnaSrdEnabled(bool value) { m_enaSrdEnabledHasBeenSet = true; m_enaSrdEnabled = value; }
+
+    /**
+     * <p>Indicates whether ENA Express is enabled for the network interface.</p>
+     */
+    inline LaunchTemplateEnaSrdSpecification& WithEnaSrdEnabled(bool value) { SetEnaSrdEnabled(value); return *this;}
+
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline const LaunchTemplateEnaSrdUdpSpecification& GetEnaSrdUdpSpecification() const{ return m_enaSrdUdpSpecification; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline bool EnaSrdUdpSpecificationHasBeenSet() const { return m_enaSrdUdpSpecificationHasBeenSet; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(const LaunchTemplateEnaSrdUdpSpecification& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = value; }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline void SetEnaSrdUdpSpecification(LaunchTemplateEnaSrdUdpSpecification&& value) { m_enaSrdUdpSpecificationHasBeenSet = true; m_enaSrdUdpSpecification = std::move(value); }
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline LaunchTemplateEnaSrdSpecification& WithEnaSrdUdpSpecification(const LaunchTemplateEnaSrdUdpSpecification& value) { SetEnaSrdUdpSpecification(value); return *this;}
+
+    /**
+     * <p>Configures ENA Express for UDP network traffic.</p>
+     */
+    inline LaunchTemplateEnaSrdSpecification& WithEnaSrdUdpSpecification(LaunchTemplateEnaSrdUdpSpecification&& value) { SetEnaSrdUdpSpecification(std::move(value)); return *this;}
+
+  private:
+
+    bool m_enaSrdEnabled;
+    bool m_enaSrdEnabledHasBeenSet = false;
+
+    LaunchTemplateEnaSrdUdpSpecification m_enaSrdUdpSpecification;
+    bool m_enaSrdUdpSpecificationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdUdpSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdUdpSpecification.h
new file mode 100644
index 00000000000..6e560c0dfa8
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateEnaSrdUdpSpecification.h
@@ -0,0 +1,78 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSStreamFwd.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Xml
+{
+  class XmlNode;
+} // namespace Xml
+} // namespace Utils
+namespace EC2
+{
+namespace Model
+{
+
+  /**
+   * <p>ENA Express is compatible with both TCP and UDP transport protocols. When
+   * it's enabled, TCP traffic automatically uses it. However, some UDP-based
+   * applications are designed to handle network packets that are out of order,
+   * without a need for retransmission, such as live video broadcasting or other
+   * near-real-time applications. For UDP traffic, you can specify whether to use ENA
+   * Express, based on your application environment needs.</p><p><h3>See Also:</h3>  
+   * <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateEnaSrdUdpSpecification">AWS
+   * API Reference</a></p>
+   */
+  class LaunchTemplateEnaSrdUdpSpecification
+  {
+  public:
+    AWS_EC2_API LaunchTemplateEnaSrdUdpSpecification();
+    AWS_EC2_API LaunchTemplateEnaSrdUdpSpecification(const Aws::Utils::Xml::XmlNode& xmlNode);
+    AWS_EC2_API LaunchTemplateEnaSrdUdpSpecification& operator=(const Aws::Utils::Xml::XmlNode& xmlNode);
+
+    AWS_EC2_API void OutputToStream(Aws::OStream& ostream, const char* location, unsigned index, const char* locationValue) const;
+    AWS_EC2_API void OutputToStream(Aws::OStream& oStream, const char* location) const;
+
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline bool GetEnaSrdUdpEnabled() const{ return m_enaSrdUdpEnabled; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline bool EnaSrdUdpEnabledHasBeenSet() const { return m_enaSrdUdpEnabledHasBeenSet; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline void SetEnaSrdUdpEnabled(bool value) { m_enaSrdUdpEnabledHasBeenSet = true; m_enaSrdUdpEnabled = value; }
+
+    /**
+     * <p>Indicates whether UDP traffic to and from the instance uses ENA Express. To
+     * specify this setting, you must first enable ENA Express.</p>
+     */
+    inline LaunchTemplateEnaSrdUdpSpecification& WithEnaSrdUdpEnabled(bool value) { SetEnaSrdUdpEnabled(value); return *this;}
+
+  private:
+
+    bool m_enaSrdUdpEnabled;
+    bool m_enaSrdUdpEnabledHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecification.h
index 5dd5e5ded11..6e25552cb8f 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecification.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecification.h
@@ -8,6 +8,7 @@
 #include <aws/core/utils/memory/stl/AWSStreamFwd.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/ec2/model/LaunchTemplateEnaSrdSpecification.h>
 #include <aws/ec2/model/InstanceIpv6Address.h>
 #include <aws/ec2/model/PrivateIpAddressSpecification.h>
 #include <aws/ec2/model/Ipv4PrefixSpecificationResponse.h>
@@ -720,6 +721,43 @@ namespace Model
      */
     inline LaunchTemplateInstanceNetworkInterfaceSpecification& WithPrimaryIpv6(bool value) { SetPrimaryIpv6(value); return *this;}
 
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline const LaunchTemplateEnaSrdSpecification& GetEnaSrdSpecification() const{ return m_enaSrdSpecification; }
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline bool EnaSrdSpecificationHasBeenSet() const { return m_enaSrdSpecificationHasBeenSet; }
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline void SetEnaSrdSpecification(const LaunchTemplateEnaSrdSpecification& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = value; }
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline void SetEnaSrdSpecification(LaunchTemplateEnaSrdSpecification&& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = std::move(value); }
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline LaunchTemplateInstanceNetworkInterfaceSpecification& WithEnaSrdSpecification(const LaunchTemplateEnaSrdSpecification& value) { SetEnaSrdSpecification(value); return *this;}
+
+    /**
+     * <p>Contains the ENA Express settings for instances launched from your launch
+     * template.</p>
+     */
+    inline LaunchTemplateInstanceNetworkInterfaceSpecification& WithEnaSrdSpecification(LaunchTemplateEnaSrdSpecification&& value) { SetEnaSrdSpecification(std::move(value)); return *this;}
+
   private:
 
     bool m_associateCarrierIpAddress;
@@ -781,6 +819,9 @@ namespace Model
 
     bool m_primaryIpv6;
     bool m_primaryIpv6HasBeenSet = false;
+
+    LaunchTemplateEnaSrdSpecification m_enaSrdSpecification;
+    bool m_enaSrdSpecificationHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.h
index 1c68109c809..6efc123ec33 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.h
@@ -8,6 +8,7 @@
 #include <aws/core/utils/memory/stl/AWSStreamFwd.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/ec2/model/EnaSrdSpecificationRequest.h>
 #include <aws/ec2/model/InstanceIpv6AddressRequest.h>
 #include <aws/ec2/model/PrivateIpAddressSpecification.h>
 #include <aws/ec2/model/Ipv4PrefixSpecificationRequest.h>
@@ -816,6 +817,37 @@ namespace Model
      */
     inline LaunchTemplateInstanceNetworkInterfaceSpecificationRequest& WithPrimaryIpv6(bool value) { SetPrimaryIpv6(value); return *this;}
 
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline const EnaSrdSpecificationRequest& GetEnaSrdSpecification() const{ return m_enaSrdSpecification; }
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline bool EnaSrdSpecificationHasBeenSet() const { return m_enaSrdSpecificationHasBeenSet; }
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline void SetEnaSrdSpecification(const EnaSrdSpecificationRequest& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = value; }
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline void SetEnaSrdSpecification(EnaSrdSpecificationRequest&& value) { m_enaSrdSpecificationHasBeenSet = true; m_enaSrdSpecification = std::move(value); }
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline LaunchTemplateInstanceNetworkInterfaceSpecificationRequest& WithEnaSrdSpecification(const EnaSrdSpecificationRequest& value) { SetEnaSrdSpecification(value); return *this;}
+
+    /**
+     * <p>Configure ENA Express settings for your launch template.</p>
+     */
+    inline LaunchTemplateInstanceNetworkInterfaceSpecificationRequest& WithEnaSrdSpecification(EnaSrdSpecificationRequest&& value) { SetEnaSrdSpecification(std::move(value)); return *this;}
+
   private:
 
     bool m_associateCarrierIpAddress;
@@ -877,6 +909,9 @@ namespace Model
 
     bool m_primaryIpv6;
     bool m_primaryIpv6HasBeenSet = false;
+
+    EnaSrdSpecificationRequest m_enaSrdSpecification;
+    bool m_enaSrdSpecificationHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateTagSpecificationRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateTagSpecificationRequest.h
index 3ca688378cb..761e385a944 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateTagSpecificationRequest.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/LaunchTemplateTagSpecificationRequest.h
@@ -47,10 +47,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline const ResourceType& GetResourceType() const{ return m_resourceType; }
@@ -60,10 +60,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline bool ResourceTypeHasBeenSet() const { return m_resourceTypeHasBeenSet; }
@@ -73,10 +73,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline void SetResourceType(const ResourceType& value) { m_resourceTypeHasBeenSet = true; m_resourceType = value; }
@@ -86,10 +86,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline void SetResourceType(ResourceType&& value) { m_resourceTypeHasBeenSet = true; m_resourceType = std::move(value); }
@@ -99,10 +99,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline LaunchTemplateTagSpecificationRequest& WithResourceType(const ResourceType& value) { SetResourceType(value); return *this;}
@@ -112,10 +112,10 @@ namespace Model
      * Amazon EC2 that can be tagged. When you create a launch template, you can
      * specify tags for the following resource types only: <code>instance</code> |
      * <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code>
-     * | <code>spot-instances-request</code>. If the instance does include the resource
-     * type that you specify, the instance launch fails. For example, not all instance
-     * types include an Elastic GPU.</p> <p>To tag a resource after it has been
-     * created, see <a
+     * | <code>spot-instances-request</code>. If the instance does not include the
+     * resource type that you specify, the instance launch fails. For example, not all
+     * instance types include an Elastic GPU.</p> <p>To tag a resource after it has
+     * been created, see <a
      * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html">CreateTags</a>.</p>
      */
     inline LaunchTemplateTagSpecificationRequest& WithResourceType(ResourceType&& value) { SetResourceType(std::move(value)); return *this;}
diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/RequestLaunchTemplateData.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/RequestLaunchTemplateData.h
index f5c60ad7501..2ab0f0cc47a 100644
--- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/RequestLaunchTemplateData.h
+++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/RequestLaunchTemplateData.h
@@ -1212,137 +1212,110 @@ namespace Model
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline const Aws::Vector<Aws::String>& GetSecurityGroupIds() const{ return m_securityGroupIds; }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline bool SecurityGroupIdsHasBeenSet() const { return m_securityGroupIdsHasBeenSet; }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline void SetSecurityGroupIds(const Aws::Vector<Aws::String>& value) { m_securityGroupIdsHasBeenSet = true; m_securityGroupIds = value; }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline void SetSecurityGroupIds(Aws::Vector<Aws::String>&& value) { m_securityGroupIdsHasBeenSet = true; m_securityGroupIds = std::move(value); }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline RequestLaunchTemplateData& WithSecurityGroupIds(const Aws::Vector<Aws::String>& value) { SetSecurityGroupIds(value); return *this;}
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline RequestLaunchTemplateData& WithSecurityGroupIds(Aws::Vector<Aws::String>&& value) { SetSecurityGroupIds(std::move(value)); return *this;}
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroupIds(const Aws::String& value) { m_securityGroupIdsHasBeenSet = true; m_securityGroupIds.push_back(value); return *this; }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroupIds(Aws::String&& value) { m_securityGroupIdsHasBeenSet = true; m_securityGroupIds.push_back(std::move(value)); return *this; }
 
     /**
      * <p>One or more security group IDs. You can create a security group using <a
-     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.
-     * You cannot specify both a security group ID and security name in the same
-     * request.</p>
+     * href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroupIds(const char* value) { m_securityGroupIdsHasBeenSet = true; m_securityGroupIds.push_back(value); return *this; }
 
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline const Aws::Vector<Aws::String>& GetSecurityGroups() const{ return m_securityGroups; }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline bool SecurityGroupsHasBeenSet() const { return m_securityGroupsHasBeenSet; }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline void SetSecurityGroups(const Aws::Vector<Aws::String>& value) { m_securityGroupsHasBeenSet = true; m_securityGroups = value; }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline void SetSecurityGroups(Aws::Vector<Aws::String>&& value) { m_securityGroupsHasBeenSet = true; m_securityGroups = std::move(value); }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline RequestLaunchTemplateData& WithSecurityGroups(const Aws::Vector<Aws::String>& value) { SetSecurityGroups(value); return *this;}
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline RequestLaunchTemplateData& WithSecurityGroups(Aws::Vector<Aws::String>&& value) { SetSecurityGroups(std::move(value)); return *this;}
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroups(const Aws::String& value) { m_securityGroupsHasBeenSet = true; m_securityGroups.push_back(value); return *this; }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroups(Aws::String&& value) { m_securityGroupsHasBeenSet = true; m_securityGroups.push_back(std::move(value)); return *this; }
 
     /**
      * <p>One or more security group names. For a nondefault VPC, you must use security
-     * group IDs instead. You cannot specify both a security group ID and security name
-     * in the same request.</p>
+     * group IDs instead.</p>
      */
     inline RequestLaunchTemplateData& AddSecurityGroups(const char* value) { m_securityGroupsHasBeenSet = true; m_securityGroups.push_back(value); return *this; }
 
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdSpecificationRequest.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdSpecificationRequest.cpp
new file mode 100644
index 00000000000..602ff557321
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdSpecificationRequest.cpp
@@ -0,0 +1,93 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/EnaSrdSpecificationRequest.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+EnaSrdSpecificationRequest::EnaSrdSpecificationRequest() : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+}
+
+EnaSrdSpecificationRequest::EnaSrdSpecificationRequest(const XmlNode& xmlNode) : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+EnaSrdSpecificationRequest& EnaSrdSpecificationRequest::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdEnabledNode = resultNode.FirstChild("EnaSrdEnabled");
+    if(!enaSrdEnabledNode.IsNull())
+    {
+      m_enaSrdEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdEnabledHasBeenSet = true;
+    }
+    XmlNode enaSrdUdpSpecificationNode = resultNode.FirstChild("EnaSrdUdpSpecification");
+    if(!enaSrdUdpSpecificationNode.IsNull())
+    {
+      m_enaSrdUdpSpecification = enaSrdUdpSpecificationNode;
+      m_enaSrdUdpSpecificationHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void EnaSrdSpecificationRequest::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdUdpSpecificationLocationAndMemberSs;
+      enaSrdUdpSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMemberSs.str().c_str());
+  }
+
+}
+
+void EnaSrdSpecificationRequest::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdUdpSpecificationLocationAndMember(location);
+      enaSrdUdpSpecificationLocationAndMember += ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMember.c_str());
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdUdpSpecificationRequest.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdUdpSpecificationRequest.cpp
new file mode 100644
index 00000000000..6cdcdd89c1f
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/EnaSrdUdpSpecificationRequest.cpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/EnaSrdUdpSpecificationRequest.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+EnaSrdUdpSpecificationRequest::EnaSrdUdpSpecificationRequest() : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+}
+
+EnaSrdUdpSpecificationRequest::EnaSrdUdpSpecificationRequest(const XmlNode& xmlNode) : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+EnaSrdUdpSpecificationRequest& EnaSrdUdpSpecificationRequest::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdUdpEnabledNode = resultNode.FirstChild("EnaSrdUdpEnabled");
+    if(!enaSrdUdpEnabledNode.IsNull())
+    {
+      m_enaSrdUdpEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdUdpEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdUdpEnabledHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void EnaSrdUdpSpecificationRequest::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+
+}
+
+void EnaSrdUdpSpecificationRequest::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdSpecification.cpp
new file mode 100644
index 00000000000..525af6e8b94
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdSpecification.cpp
@@ -0,0 +1,93 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/InstanceAttachmentEnaSrdSpecification.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+InstanceAttachmentEnaSrdSpecification::InstanceAttachmentEnaSrdSpecification() : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+}
+
+InstanceAttachmentEnaSrdSpecification::InstanceAttachmentEnaSrdSpecification(const XmlNode& xmlNode) : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+InstanceAttachmentEnaSrdSpecification& InstanceAttachmentEnaSrdSpecification::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdEnabledNode = resultNode.FirstChild("enaSrdEnabled");
+    if(!enaSrdEnabledNode.IsNull())
+    {
+      m_enaSrdEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdEnabledHasBeenSet = true;
+    }
+    XmlNode enaSrdUdpSpecificationNode = resultNode.FirstChild("enaSrdUdpSpecification");
+    if(!enaSrdUdpSpecificationNode.IsNull())
+    {
+      m_enaSrdUdpSpecification = enaSrdUdpSpecificationNode;
+      m_enaSrdUdpSpecificationHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void InstanceAttachmentEnaSrdSpecification::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdUdpSpecificationLocationAndMemberSs;
+      enaSrdUdpSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMemberSs.str().c_str());
+  }
+
+}
+
+void InstanceAttachmentEnaSrdSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdUdpSpecificationLocationAndMember(location);
+      enaSrdUdpSpecificationLocationAndMember += ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMember.c_str());
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdUdpSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdUdpSpecification.cpp
new file mode 100644
index 00000000000..078114a841f
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceAttachmentEnaSrdUdpSpecification.cpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/InstanceAttachmentEnaSrdUdpSpecification.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+InstanceAttachmentEnaSrdUdpSpecification::InstanceAttachmentEnaSrdUdpSpecification() : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+}
+
+InstanceAttachmentEnaSrdUdpSpecification::InstanceAttachmentEnaSrdUdpSpecification(const XmlNode& xmlNode) : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+InstanceAttachmentEnaSrdUdpSpecification& InstanceAttachmentEnaSrdUdpSpecification::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdUdpEnabledNode = resultNode.FirstChild("enaSrdUdpEnabled");
+    if(!enaSrdUdpEnabledNode.IsNull())
+    {
+      m_enaSrdUdpEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdUdpEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdUdpEnabledHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void InstanceAttachmentEnaSrdUdpSpecification::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+
+}
+
+void InstanceAttachmentEnaSrdUdpSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp
index 4d93d7786d1..1f991a95f0c 100644
--- a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp
@@ -30,7 +30,8 @@ InstanceNetworkInterfaceAttachment::InstanceNetworkInterfaceAttachment() :
     m_status(AttachmentStatus::NOT_SET),
     m_statusHasBeenSet(false),
     m_networkCardIndex(0),
-    m_networkCardIndexHasBeenSet(false)
+    m_networkCardIndexHasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
 }
 
@@ -44,7 +45,8 @@ InstanceNetworkInterfaceAttachment::InstanceNetworkInterfaceAttachment(const Xml
     m_status(AttachmentStatus::NOT_SET),
     m_statusHasBeenSet(false),
     m_networkCardIndex(0),
-    m_networkCardIndexHasBeenSet(false)
+    m_networkCardIndexHasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -91,6 +93,12 @@ InstanceNetworkInterfaceAttachment& InstanceNetworkInterfaceAttachment::operator
       m_networkCardIndex = StringUtils::ConvertToInt32(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(networkCardIndexNode.GetText()).c_str()).c_str());
       m_networkCardIndexHasBeenSet = true;
     }
+    XmlNode enaSrdSpecificationNode = resultNode.FirstChild("enaSrdSpecification");
+    if(!enaSrdSpecificationNode.IsNull())
+    {
+      m_enaSrdSpecification = enaSrdSpecificationNode;
+      m_enaSrdSpecificationHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -128,6 +136,13 @@ void InstanceNetworkInterfaceAttachment::OutputToStream(Aws::OStream& oStream, c
       oStream << location << index << locationValue << ".NetworkCardIndex=" << m_networkCardIndex << "&";
   }
 
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdSpecificationLocationAndMemberSs;
+      enaSrdSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMemberSs.str().c_str());
+  }
+
 }
 
 void InstanceNetworkInterfaceAttachment::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -156,6 +171,12 @@ void InstanceNetworkInterfaceAttachment::OutputToStream(Aws::OStream& oStream, c
   {
       oStream << location << ".NetworkCardIndex=" << m_networkCardIndex << "&";
   }
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdSpecificationLocationAndMember(location);
+      enaSrdSpecificationLocationAndMember += ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMember.c_str());
+  }
 }
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp
index 02370e15e08..81a0b9f6104 100644
--- a/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp
@@ -50,7 +50,8 @@ InstanceNetworkInterfaceSpecification::InstanceNetworkInterfaceSpecification() :
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
 }
 
@@ -84,7 +85,8 @@ InstanceNetworkInterfaceSpecification::InstanceNetworkInterfaceSpecification(con
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -245,6 +247,12 @@ InstanceNetworkInterfaceSpecification& InstanceNetworkInterfaceSpecification::op
       m_primaryIpv6 = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(primaryIpv6Node.GetText()).c_str()).c_str());
       m_primaryIpv6HasBeenSet = true;
     }
+    XmlNode enaSrdSpecificationNode = resultNode.FirstChild("EnaSrdSpecification");
+    if(!enaSrdSpecificationNode.IsNull())
+    {
+      m_enaSrdSpecification = enaSrdSpecificationNode;
+      m_enaSrdSpecificationHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -380,6 +388,13 @@ void InstanceNetworkInterfaceSpecification::OutputToStream(Aws::OStream& oStream
       oStream << location << index << locationValue << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
 
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdSpecificationLocationAndMemberSs;
+      enaSrdSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMemberSs.str().c_str());
+  }
+
 }
 
 void InstanceNetworkInterfaceSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -492,6 +507,12 @@ void InstanceNetworkInterfaceSpecification::OutputToStream(Aws::OStream& oStream
   {
       oStream << location << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdSpecificationLocationAndMember(location);
+      enaSrdSpecificationLocationAndMember += ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMember.c_str());
+  }
 }
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdSpecification.cpp
new file mode 100644
index 00000000000..8be9e6ec508
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdSpecification.cpp
@@ -0,0 +1,93 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/LaunchTemplateEnaSrdSpecification.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+LaunchTemplateEnaSrdSpecification::LaunchTemplateEnaSrdSpecification() : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+}
+
+LaunchTemplateEnaSrdSpecification::LaunchTemplateEnaSrdSpecification(const XmlNode& xmlNode) : 
+    m_enaSrdEnabled(false),
+    m_enaSrdEnabledHasBeenSet(false),
+    m_enaSrdUdpSpecificationHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+LaunchTemplateEnaSrdSpecification& LaunchTemplateEnaSrdSpecification::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdEnabledNode = resultNode.FirstChild("enaSrdEnabled");
+    if(!enaSrdEnabledNode.IsNull())
+    {
+      m_enaSrdEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdEnabledHasBeenSet = true;
+    }
+    XmlNode enaSrdUdpSpecificationNode = resultNode.FirstChild("enaSrdUdpSpecification");
+    if(!enaSrdUdpSpecificationNode.IsNull())
+    {
+      m_enaSrdUdpSpecification = enaSrdUdpSpecificationNode;
+      m_enaSrdUdpSpecificationHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void LaunchTemplateEnaSrdSpecification::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdUdpSpecificationLocationAndMemberSs;
+      enaSrdUdpSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMemberSs.str().c_str());
+  }
+
+}
+
+void LaunchTemplateEnaSrdSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdEnabled=" << std::boolalpha << m_enaSrdEnabled << "&";
+  }
+  if(m_enaSrdUdpSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdUdpSpecificationLocationAndMember(location);
+      enaSrdUdpSpecificationLocationAndMember += ".EnaSrdUdpSpecification";
+      m_enaSrdUdpSpecification.OutputToStream(oStream, enaSrdUdpSpecificationLocationAndMember.c_str());
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdUdpSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdUdpSpecification.cpp
new file mode 100644
index 00000000000..879691e721e
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateEnaSrdUdpSpecification.cpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/ec2/model/LaunchTemplateEnaSrdUdpSpecification.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Xml;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace EC2
+{
+namespace Model
+{
+
+LaunchTemplateEnaSrdUdpSpecification::LaunchTemplateEnaSrdUdpSpecification() : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+}
+
+LaunchTemplateEnaSrdUdpSpecification::LaunchTemplateEnaSrdUdpSpecification(const XmlNode& xmlNode) : 
+    m_enaSrdUdpEnabled(false),
+    m_enaSrdUdpEnabledHasBeenSet(false)
+{
+  *this = xmlNode;
+}
+
+LaunchTemplateEnaSrdUdpSpecification& LaunchTemplateEnaSrdUdpSpecification::operator =(const XmlNode& xmlNode)
+{
+  XmlNode resultNode = xmlNode;
+
+  if(!resultNode.IsNull())
+  {
+    XmlNode enaSrdUdpEnabledNode = resultNode.FirstChild("enaSrdUdpEnabled");
+    if(!enaSrdUdpEnabledNode.IsNull())
+    {
+      m_enaSrdUdpEnabled = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(enaSrdUdpEnabledNode.GetText()).c_str()).c_str());
+      m_enaSrdUdpEnabledHasBeenSet = true;
+    }
+  }
+
+  return *this;
+}
+
+void LaunchTemplateEnaSrdUdpSpecification::OutputToStream(Aws::OStream& oStream, const char* location, unsigned index, const char* locationValue) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+
+}
+
+void LaunchTemplateEnaSrdUdpSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
+{
+  if(m_enaSrdUdpEnabledHasBeenSet)
+  {
+      oStream << location << ".EnaSrdUdpEnabled=" << std::boolalpha << m_enaSrdUdpEnabled << "&";
+  }
+}
+
+} // namespace Model
+} // namespace EC2
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecification.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecification.cpp
index c286cd39f6e..2628df4fb56 100644
--- a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecification.cpp
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecification.cpp
@@ -50,7 +50,8 @@ LaunchTemplateInstanceNetworkInterfaceSpecification::LaunchTemplateInstanceNetwo
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
 }
 
@@ -84,7 +85,8 @@ LaunchTemplateInstanceNetworkInterfaceSpecification::LaunchTemplateInstanceNetwo
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -245,6 +247,12 @@ LaunchTemplateInstanceNetworkInterfaceSpecification& LaunchTemplateInstanceNetwo
       m_primaryIpv6 = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(primaryIpv6Node.GetText()).c_str()).c_str());
       m_primaryIpv6HasBeenSet = true;
     }
+    XmlNode enaSrdSpecificationNode = resultNode.FirstChild("enaSrdSpecification");
+    if(!enaSrdSpecificationNode.IsNull())
+    {
+      m_enaSrdSpecification = enaSrdSpecificationNode;
+      m_enaSrdSpecificationHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -380,6 +388,13 @@ void LaunchTemplateInstanceNetworkInterfaceSpecification::OutputToStream(Aws::OS
       oStream << location << index << locationValue << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
 
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdSpecificationLocationAndMemberSs;
+      enaSrdSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMemberSs.str().c_str());
+  }
+
 }
 
 void LaunchTemplateInstanceNetworkInterfaceSpecification::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -492,6 +507,12 @@ void LaunchTemplateInstanceNetworkInterfaceSpecification::OutputToStream(Aws::OS
   {
       oStream << location << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdSpecificationLocationAndMember(location);
+      enaSrdSpecificationLocationAndMember += ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMember.c_str());
+  }
 }
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.cpp b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.cpp
index fe82bb886d5..9b565face49 100644
--- a/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.cpp
+++ b/generated/src/aws-cpp-sdk-ec2/source/model/LaunchTemplateInstanceNetworkInterfaceSpecificationRequest.cpp
@@ -50,7 +50,8 @@ LaunchTemplateInstanceNetworkInterfaceSpecificationRequest::LaunchTemplateInstan
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
 }
 
@@ -84,7 +85,8 @@ LaunchTemplateInstanceNetworkInterfaceSpecificationRequest::LaunchTemplateInstan
     m_ipv6PrefixCount(0),
     m_ipv6PrefixCountHasBeenSet(false),
     m_primaryIpv6(false),
-    m_primaryIpv6HasBeenSet(false)
+    m_primaryIpv6HasBeenSet(false),
+    m_enaSrdSpecificationHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -245,6 +247,12 @@ LaunchTemplateInstanceNetworkInterfaceSpecificationRequest& LaunchTemplateInstan
       m_primaryIpv6 = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(primaryIpv6Node.GetText()).c_str()).c_str());
       m_primaryIpv6HasBeenSet = true;
     }
+    XmlNode enaSrdSpecificationNode = resultNode.FirstChild("EnaSrdSpecification");
+    if(!enaSrdSpecificationNode.IsNull())
+    {
+      m_enaSrdSpecification = enaSrdSpecificationNode;
+      m_enaSrdSpecificationHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -380,6 +388,13 @@ void LaunchTemplateInstanceNetworkInterfaceSpecificationRequest::OutputToStream(
       oStream << location << index << locationValue << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
 
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::StringStream enaSrdSpecificationLocationAndMemberSs;
+      enaSrdSpecificationLocationAndMemberSs << location << index << locationValue << ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMemberSs.str().c_str());
+  }
+
 }
 
 void LaunchTemplateInstanceNetworkInterfaceSpecificationRequest::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -492,6 +507,12 @@ void LaunchTemplateInstanceNetworkInterfaceSpecificationRequest::OutputToStream(
   {
       oStream << location << ".PrimaryIpv6=" << std::boolalpha << m_primaryIpv6 << "&";
   }
+  if(m_enaSrdSpecificationHasBeenSet)
+  {
+      Aws::String enaSrdSpecificationLocationAndMember(location);
+      enaSrdSpecificationLocationAndMember += ".EnaSrdSpecification";
+      m_enaSrdSpecification.OutputToStream(oStream, enaSrdSpecificationLocationAndMember.c_str());
+  }
 }
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h b/generated/src/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
index 047d2ca4a9c..45baa7f6668 100644
--- a/generated/src/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
+++ b/generated/src/aws-cpp-sdk-fms/include/aws/fms/FMSClient.h
@@ -1105,24 +1105,35 @@ namespace FMS
         }
 
         /**
-         * <p>Creates an Firewall Manager policy.</p> <p>Firewall Manager provides the
-         * following types of policies: </p> <ul> <li> <p>An WAF policy (type WAFV2), which
-         * defines rule groups to run first in the corresponding WAF web ACL and rule
-         * groups to run last in the web ACL.</p> </li> <li> <p>An WAF Classic policy (type
-         * WAF), which defines a rule group. </p> </li> <li> <p>A Shield Advanced policy,
-         * which applies Shield Advanced protection to specified accounts and
-         * resources.</p> </li> <li> <p>A security group policy, which manages VPC security
-         * groups across your Amazon Web Services organization. </p> </li> <li> <p>An
-         * Network Firewall policy, which provides firewall rules to filter network traffic
-         * in specified Amazon VPCs.</p> </li> <li> <p>A DNS Firewall policy, which
-         * provides Route 53 Resolver DNS Firewall rules to filter DNS queries for
-         * specified VPCs.</p> </li> </ul> <p>Each policy is specific to one of the types.
-         * If you want to enforce more than one policy type across accounts, create
-         * multiple policies. You can create multiple policies for each type.</p> <p>You
-         * must be subscribed to Shield Advanced to create a Shield Advanced policy. For
-         * more information about subscribing to Shield Advanced, see <a
-         * href="https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html">CreateSubscription</a>.</p><p><h3>See
-         * Also:</h3>   <a
+         * <p>Creates an Firewall Manager policy.</p> <p>A Firewall Manager policy is
+         * specific to the individual policy type. If you want to enforce multiple policy
+         * types across accounts, you can create multiple policies. You can create more
+         * than one policy for each type. </p> <p>If you add a new account to an
+         * organization that you created with Organizations, Firewall Manager automatically
+         * applies the policy to the resources in that account that are within scope of the
+         * policy. </p> <p>Firewall Manager provides the following types of policies: </p>
+         * <ul> <li> <p> <b>Shield Advanced policy</b> - This policy applies Shield
+         * Advanced protection to specified accounts and resources. </p> </li> <li> <p>
+         * <b>Security Groups policy</b> - This type of policy gives you control over
+         * security groups that are in use throughout your organization in Organizations
+         * and lets you enforce a baseline set of rules across your organization. </p>
+         * </li> <li> <p> <b>Network Firewall policy</b> - This policy applies Network
+         * Firewall protection to your organization's VPCs. </p> </li> <li> <p> <b>DNS
+         * Firewall policy</b> - This policy applies Amazon Route 53 Resolver DNS Firewall
+         * protections to your organization's VPCs. </p> </li> <li> <p> <b>Third-party
+         * firewall policy</b> - This policy applies third-party firewall protections.
+         * Third-party firewalls are available by subscription through the Amazon Web
+         * Services Marketplace console at <a
+         * href="https://aws.amazon.com/marketplace">Amazon Web Services
+         * Marketplace</a>.</p> <ul> <li> <p> <b>Palo Alto Networks Cloud NGFW policy</b> -
+         * This policy applies Palo Alto Networks Cloud Next Generation Firewall (NGFW)
+         * protections and Palo Alto Networks Cloud NGFW rulestacks to your organization's
+         * VPCs.</p> </li> <li> <p> <b>Fortigate CNF policy</b> - This policy applies
+         * Fortigate Cloud Native Firewall (CNF) protections. Fortigate CNF is a
+         * cloud-centered solution that blocks Zero-Day threats and secures cloud
+         * infrastructures with industry-leading advanced threat prevention, smart web
+         * application firewalls (WAF), and API protection.</p> </li> </ul> </li>
+         * </ul><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PutPolicy">AWS API
          * Reference</a></p>
          */
diff --git a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/DeletePolicyRequest.h b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/DeletePolicyRequest.h
index 504bea52c94..e7c34e101e4 100644
--- a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/DeletePolicyRequest.h
+++ b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/DeletePolicyRequest.h
@@ -93,14 +93,17 @@ namespace Model
      * policy:</p> <ul> <li> <p>Disassociates the security group from in-scope
      * resources </p> </li> <li> <p>Deletes the security group if it was created
      * through Firewall Manager and if it's no longer associated with any resources
-     * through another policy</p> </li> </ul> <p>After the cleanup, in-scope resources
-     * are no longer protected by web ACLs in this policy. Protection of out-of-scope
-     * resources remains unchanged. Scope is determined by tags that you create and
-     * accounts that you associate with the policy. When creating the policy, if you
-     * specify that only resources in specific accounts or with specific tags are in
-     * scope of the policy, those accounts and resources are handled by the policy. All
-     * others are out of scope. If you don't specify tags or accounts, all resources
-     * are in scope. </p>
+     * through another policy</p> </li> </ul>  <p>For security group common
+     * policies, even if set to <code>False</code>, Firewall Manager deletes all
+     * security groups created by Firewall Manager that aren't associated with any
+     * other resources through another policy.</p>  <p>After the cleanup,
+     * in-scope resources are no longer protected by web ACLs in this policy.
+     * Protection of out-of-scope resources remains unchanged. Scope is determined by
+     * tags that you create and accounts that you associate with the policy. When
+     * creating the policy, if you specify that only resources in specific accounts or
+     * with specific tags are in scope of the policy, those accounts and resources are
+     * handled by the policy. All others are out of scope. If you don't specify tags or
+     * accounts, all resources are in scope. </p>
      */
     inline bool GetDeleteAllPolicyResources() const{ return m_deleteAllPolicyResources; }
 
@@ -114,14 +117,17 @@ namespace Model
      * policy:</p> <ul> <li> <p>Disassociates the security group from in-scope
      * resources </p> </li> <li> <p>Deletes the security group if it was created
      * through Firewall Manager and if it's no longer associated with any resources
-     * through another policy</p> </li> </ul> <p>After the cleanup, in-scope resources
-     * are no longer protected by web ACLs in this policy. Protection of out-of-scope
-     * resources remains unchanged. Scope is determined by tags that you create and
-     * accounts that you associate with the policy. When creating the policy, if you
-     * specify that only resources in specific accounts or with specific tags are in
-     * scope of the policy, those accounts and resources are handled by the policy. All
-     * others are out of scope. If you don't specify tags or accounts, all resources
-     * are in scope. </p>
+     * through another policy</p> </li> </ul>  <p>For security group common
+     * policies, even if set to <code>False</code>, Firewall Manager deletes all
+     * security groups created by Firewall Manager that aren't associated with any
+     * other resources through another policy.</p>  <p>After the cleanup,
+     * in-scope resources are no longer protected by web ACLs in this policy.
+     * Protection of out-of-scope resources remains unchanged. Scope is determined by
+     * tags that you create and accounts that you associate with the policy. When
+     * creating the policy, if you specify that only resources in specific accounts or
+     * with specific tags are in scope of the policy, those accounts and resources are
+     * handled by the policy. All others are out of scope. If you don't specify tags or
+     * accounts, all resources are in scope. </p>
      */
     inline bool DeleteAllPolicyResourcesHasBeenSet() const { return m_deleteAllPolicyResourcesHasBeenSet; }
 
@@ -135,14 +141,17 @@ namespace Model
      * policy:</p> <ul> <li> <p>Disassociates the security group from in-scope
      * resources </p> </li> <li> <p>Deletes the security group if it was created
      * through Firewall Manager and if it's no longer associated with any resources
-     * through another policy</p> </li> </ul> <p>After the cleanup, in-scope resources
-     * are no longer protected by web ACLs in this policy. Protection of out-of-scope
-     * resources remains unchanged. Scope is determined by tags that you create and
-     * accounts that you associate with the policy. When creating the policy, if you
-     * specify that only resources in specific accounts or with specific tags are in
-     * scope of the policy, those accounts and resources are handled by the policy. All
-     * others are out of scope. If you don't specify tags or accounts, all resources
-     * are in scope. </p>
+     * through another policy</p> </li> </ul>  <p>For security group common
+     * policies, even if set to <code>False</code>, Firewall Manager deletes all
+     * security groups created by Firewall Manager that aren't associated with any
+     * other resources through another policy.</p>  <p>After the cleanup,
+     * in-scope resources are no longer protected by web ACLs in this policy.
+     * Protection of out-of-scope resources remains unchanged. Scope is determined by
+     * tags that you create and accounts that you associate with the policy. When
+     * creating the policy, if you specify that only resources in specific accounts or
+     * with specific tags are in scope of the policy, those accounts and resources are
+     * handled by the policy. All others are out of scope. If you don't specify tags or
+     * accounts, all resources are in scope. </p>
      */
     inline void SetDeleteAllPolicyResources(bool value) { m_deleteAllPolicyResourcesHasBeenSet = true; m_deleteAllPolicyResources = value; }
 
@@ -156,14 +165,17 @@ namespace Model
      * policy:</p> <ul> <li> <p>Disassociates the security group from in-scope
      * resources </p> </li> <li> <p>Deletes the security group if it was created
      * through Firewall Manager and if it's no longer associated with any resources
-     * through another policy</p> </li> </ul> <p>After the cleanup, in-scope resources
-     * are no longer protected by web ACLs in this policy. Protection of out-of-scope
-     * resources remains unchanged. Scope is determined by tags that you create and
-     * accounts that you associate with the policy. When creating the policy, if you
-     * specify that only resources in specific accounts or with specific tags are in
-     * scope of the policy, those accounts and resources are handled by the policy. All
-     * others are out of scope. If you don't specify tags or accounts, all resources
-     * are in scope. </p>
+     * through another policy</p> </li> </ul>  <p>For security group common
+     * policies, even if set to <code>False</code>, Firewall Manager deletes all
+     * security groups created by Firewall Manager that aren't associated with any
+     * other resources through another policy.</p>  <p>After the cleanup,
+     * in-scope resources are no longer protected by web ACLs in this policy.
+     * Protection of out-of-scope resources remains unchanged. Scope is determined by
+     * tags that you create and accounts that you associate with the policy. When
+     * creating the policy, if you specify that only resources in specific accounts or
+     * with specific tags are in scope of the policy, those accounts and resources are
+     * handled by the policy. All others are out of scope. If you don't specify tags or
+     * accounts, all resources are in scope. </p>
      */
     inline DeletePolicyRequest& WithDeleteAllPolicyResources(bool value) { SetDeleteAllPolicyResources(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/GetViolationDetailsRequest.h b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/GetViolationDetailsRequest.h
index c417094d557..d9f380c6082 100644
--- a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/GetViolationDetailsRequest.h
+++ b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/GetViolationDetailsRequest.h
@@ -35,50 +35,74 @@ namespace Model
 
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline const Aws::String& GetPolicyId() const{ return m_policyId; }
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline bool PolicyIdHasBeenSet() const { return m_policyIdHasBeenSet; }
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline void SetPolicyId(const Aws::String& value) { m_policyIdHasBeenSet = true; m_policyId = value; }
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline void SetPolicyId(Aws::String&& value) { m_policyIdHasBeenSet = true; m_policyId = std::move(value); }
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline void SetPolicyId(const char* value) { m_policyIdHasBeenSet = true; m_policyId.assign(value); }
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline GetViolationDetailsRequest& WithPolicyId(const Aws::String& value) { SetPolicyId(value); return *this;}
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline GetViolationDetailsRequest& WithPolicyId(Aws::String&& value) { SetPolicyId(std::move(value)); return *this;}
 
     /**
-     * <p>The ID of the Firewall Manager policy that you want the details for. This
-     * currently only supports security group content audit policies.</p>
+     * <p>The ID of the Firewall Manager policy that you want the details for. You can
+     * get violation details for the following policy types:</p> <ul> <li> <p>DNS
+     * Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network
+     * Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li>
+     * <p>Third-party firewall</p> </li> </ul>
      */
     inline GetViolationDetailsRequest& WithPolicyId(const char* value) { SetPolicyId(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
index 7dc2d76be05..535f6fd03cd 100644
--- a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
+++ b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/Policy.h
@@ -241,18 +241,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline const Aws::String& GetResourceType() const{ return m_resourceType; }
 
@@ -262,18 +267,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline bool ResourceTypeHasBeenSet() const { return m_resourceTypeHasBeenSet; }
 
@@ -283,18 +293,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline void SetResourceType(const Aws::String& value) { m_resourceTypeHasBeenSet = true; m_resourceType = value; }
 
@@ -304,18 +319,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline void SetResourceType(Aws::String&& value) { m_resourceTypeHasBeenSet = true; m_resourceType = std::move(value); }
 
@@ -325,18 +345,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline void SetResourceType(const char* value) { m_resourceTypeHasBeenSet = true; m_resourceType.assign(value); }
 
@@ -346,18 +371,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline Policy& WithResourceType(const Aws::String& value) { SetResourceType(value); return *this;}
 
@@ -367,18 +397,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline Policy& WithResourceType(Aws::String&& value) { SetResourceType(std::move(value)); return *this;}
 
@@ -388,18 +423,23 @@ namespace Model
      * href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html">Amazon
      * Web Services Resource Types Reference</a>. To apply this policy to multiple
      * resource types, specify a resource type of <code>ResourceTypeList</code> and
-     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For
-     * WAF and Shield Advanced, resource types include
+     * then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The
+     * following are valid resource types for each Firewall Manager policy type:</p>
+     * <ul> <li> <p>Amazon Web Services WAF Classic -
+     * <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>,
+     * and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li>
+     * <p>WAF - <code>AWS::ApiGateway::Stage</code>,
+     * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and
+     * <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall,
+     * Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p>
+     * </li> <li> <p>Shield Advanced -
      * <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>,
      * <code>AWS::ElasticLoadBalancing::LoadBalancer</code>,
-     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For
-     * a security group common policy, valid values are
-     * <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For
-     * a security group content audit policy, valid values are
+     * <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p>
+     * </li> <li> <p>Security group content audit -
      * <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>,
-     * and <code>AWS::EC2::Instance</code>. For a security group usage audit policy,
-     * the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall
-     * policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>
+     * and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage
+     * audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>
      */
     inline Policy& WithResourceType(const char* value) { SetResourceType(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
index 7735021c865..dbfed21b6d8 100644
--- a/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
+++ b/generated/src/aws-cpp-sdk-fms/include/aws/fms/model/SecurityServicePolicyData.h
@@ -108,6 +108,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -156,16 +157,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -194,12 +186,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -209,38 +220,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -289,6 +336,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -337,16 +385,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -375,12 +414,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -390,38 +448,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -470,6 +564,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -518,16 +613,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -556,12 +642,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -571,38 +676,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -651,6 +792,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -699,16 +841,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -737,12 +870,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -752,38 +904,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -832,6 +1020,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -880,16 +1069,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -918,12 +1098,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -933,38 +1132,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -1013,6 +1248,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -1061,16 +1297,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -1099,12 +1326,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -1114,38 +1360,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -1194,6 +1476,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -1242,16 +1525,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -1280,12 +1554,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -1295,38 +1588,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
@@ -1375,6 +1704,7 @@ namespace Model
      * </p>  <p>Valid values for <code>preProcessRuleGroups</code> are between 1
      * and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and
      * 10000.</p>  </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code>
+     * </p> <p>
      * <code>"{\"type\":\"IMPORT_NETWORK_FIREWALL\",\"awsNetworkFirewallConfig\":{\"networkFirewallStatelessRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\/rg1\",\"priority\":1}],\"networkFirewallStatelessDefaultActions\":[\"aws:drop\"],\"networkFirewallStatelessFragmentDefaultActions\":[\"aws:pass\"],\"networkFirewallStatelessCustomActions\":[],\"networkFirewallStatefulRuleGroupReferences\":[{\"resourceARN\":\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\/ThreatSignaturesEmergingEventsStrictOrder\",\"priority\":8}],\"networkFirewallStatefulEngineOptions\":{\"ruleOrder\":\"STRICT_ORDER\"},\"networkFirewallStatefulDefaultActions\":[\"aws:drop_strict\"]}}"</code>
      * </p> <p>
      * <code>"{\"type\":\"DNS_FIREWALL\",\"preProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-1\",\"priority\":10}],\"postProcessRuleGroups\":[{\"ruleGroupId\":\"rslvr-frg-2\",\"priority\":9911}]}"</code>
@@ -1423,16 +1753,7 @@ namespace Model
      * </code> </p> <p>To use the distributed deployment model, you must set <a
      * href="https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html">PolicyOption</a>
      * to <code>NULL</code>. </p> </li> <li> <p>Example:
-     * <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>"{
-     * "type":"THIRD_PARTY_FIREWALL",
-     * "thirdPartyFirewall":"PALO_ALTO_NETWORKS_CLOUD_NGFW",
-     * "thirdPartyFirewallConfig":{ "thirdPartyFirewallPolicyList":["global-1"] },
-     * "firewallDeploymentModel":{ "distributedFirewallDeploymentModel":{
-     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
-     * "endpointLocation":{ "availabilityZoneConfigList":[ {
-     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
-     * } } } }"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code>
-     * </p> <p>
+     * <code>SECURITY_GROUPS_COMMON</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_COMMON\",\"revertManualSecurityGroupChanges\":false,\"exclusiveResourceSecurityGroupManagement\":false,
      * \"applyToAllEC2InstanceENIs\":false,\"securityGroups\":[{\"id\":\"
      * sg-000e55995d61a06bd\"}]}"</code> </p> </li> <li> <p>Example:
@@ -1461,12 +1782,31 @@ namespace Model
      * a range that matches a rule value or range in the policy security group.</p>
      * </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p>
      * <code>"{\"type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"deleteUnusedSecurityGroups\":true,\"coalesceRedundantSecurityGroups\":true}"</code>
-     * </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon
-     * CloudFront distributions </p> <p>
+     * </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL
+     * management</p> <p>
+     * <code>"{\"type\":\"SHIELD_ADVANCED\",\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager doesn't disassociate the resource from the
+     * web ACL. If you want Firewall Manager to clean up the web ACL, you must first
+     * manually disassociate the resources from the web ACL, and then enable the manage
+     * unused web ACLs option in your policy.</p> <p>If you set
+     * <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall
+     * Manager automatically creates an empty web ACL in each account that's within
+     * policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code>
+     * for Amazon CloudFront distributions </p> <p>
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED|IGNORED|DISABLED\",
      * \"automaticResponseAction\":\"BLOCK|COUNT\"},
-     * \"overrideCustomerWebaclClassic\":true|false}"</code> </p> <p>For example:
+     * \"overrideCustomerWebaclClassic\":true|false,
+     * \"optimizeUnassociatedWebACL\":true|false}"</code> </p> <p>For example:
      * <code>"{\"type\":\"SHIELD_ADVANCED\",\"automaticResponseConfiguration\":
      * {\"automaticResponseStatus\":\"ENABLED\",
      * \"automaticResponseAction\":\"COUNT\"}}"</code> </p> <p>The default value for
@@ -1476,38 +1816,74 @@ namespace Model
      * value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p>
      * <p>For other resource types that you can protect with a Shield Advanced policy,
      * this <code>ManagedServiceData</code> configuration is an empty string.</p> </li>
-     * <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot
-     * Control managed rule groups, and rule action override </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true}"</code>
-     * </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For
-     * information about the properties available for
+     * <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace
+     * <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party
+     * firewall.</p> <p> <code>"{ "type":"THIRD_PARTY_FIREWALL",
+     * "thirdPartyFirewall":"THIRD_PARTY_FIREWALL_NAME", "thirdPartyFirewallConfig":{
+     * "thirdPartyFirewallPolicyList":["global-1"] }, "firewallDeploymentModel":{
+     * "distributedFirewallDeploymentModel":{
+     * "distributedFirewallOrchestrationConfig":{ "firewallCreationConfig":{
+     * "endpointLocation":{ "availabilityZoneConfigList":[ {
+     * "availabilityZoneName":"${AvailabilityZone}" } ] } }, "allowedIPV4CidrList":[ ]
+     * } } } }"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account
+     * takeover prevention, Bot Control managed rule groups, optimize unassociated web
+     * ACL, and rule action override </p> <p>
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesATPRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesATPRuleSet\":{\"loginPath\":\"/loginpath\",\"requestInspection\":{\"payloadType\":\"FORM_ENCODED|JSON\",\"usernameField\":{\"identifier\":\"/form/username\"},\"passwordField\":{\"identifier\":\"/form/password\"}}}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true},{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesBotControlRuleSet\",\"managedRuleGroupConfigs\":[{\"awsmanagedRulesBotControlRuleSet\":{\"inspectionLevel\":\"TARGETED|COMMON\"}}]},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true,\"ruleActionOverrides\":[{\"name\":\"Rule1\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}},{\"name\":\"Rule2\",\"actionToUse\":{\"allow|block|count|captcha|challenge\":{}}}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"optimizeUnassociatedWebACL\":true}"</code>
+     * </p> <ul> <li> <p>Bot Control - For information about
+     * <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account
+     * takeover prevention (ATP) - For information about the properties available for
      * <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html">AWSManagedRulesATPRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information
-     * about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a
-     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html">AWSManagedRulesBotControlRuleSet</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides -
-     * Firewall Manager supports rule action overrides only for managed rule groups. To
-     * configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the
-     * rule to override, and <code>ActionToUse</code>, which is the new action to use
-     * for the rule. For information about using rule action override, see <a
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL
+     * - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>,
+     * Firewall Manager creates web ACLs in accounts within the policy scope if the web
+     * ACLs will be used by at least one resource. Firewall Manager creates web ACLs in
+     * the accounts within policy scope only if the web ACLs will be used by at least
+     * one resource. If at any time an account comes into policy scope, Firewall
+     * Manager automatically creates a web ACL in the account if at least one resource
+     * will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a
+     * one-time cleanup of unused web ACLs in your account. The cleanup process can
+     * take several hours. If a resource leaves policy scope after Firewall Manager
+     * creates a web ACL, Firewall Manager disassociates the resource from the web ACL,
+     * but won't clean up the unused web ACL. Firewall Manager only cleans up unused
+     * web ACLs when you first enable management of unused web ACLs in a policy.</p>
+     * <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>
+     * Firewall Manager doesn't manage unused web ACLs, and Firewall Manager
+     * automatically creates an empty web ACL in each account that's within policy
+     * scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule
+     * action overrides only for managed rule groups. To configure a
+     * <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to
+     * override, and <code>ActionToUse</code>, which is the new action to use for the
+     * rule. For information about using rule action override, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html">RuleActionOverride</a>
      * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
      * <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs
      * </p> <p>
-     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"]}"</code>
-     * </p> <p>If you update the policy's values for <code>captchaConfig</code>,
-     * <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager
-     * will overwrite your local web ACLs to contain the new value(s). However, if you
-     * don't update the policy's <code>captchaConfig</code>,
+     * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":null,\"version\":null,\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesAdminProtectionRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[],\"sampledRequestsEnabled\":true}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"customRequestHandling\":null,\"customResponse\":null,\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":null,\"sampledRequestsEnabledForDefaultActions\":true,\"captchaConfig\":{\"immunityTimeProperty\":{\"immunityTime\":500}},\"challengeConfig\":{\"immunityTimeProperty\":{\"immunityTime\":800}},\"tokenDomains\":[\"google.com\",\"amazon.com\"],\"associationConfig\":{\"requestBody\":{\"CLOUDFRONT\":{\"defaultSizeInspectionLimit\":\"KB_16\"}}}}"</code>
+     * </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If
+     * you update the policy's values for <code>associationConfig</code>,
+     * <code>captchaConfig</code>, <code>challengeConfig</code>, or
+     * <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs
+     * to contain the new value(s). However, if you don't update the policy's
+     * <code>associationConfig</code>, <code>captchaConfig</code>,
      * <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in
-     * your local web ACLs will remain unchanged. For information about CAPTCHA and
-     * Challenge configs, see <a
+     * your local web ACLs will remain unchanged. For information about association
+     * configs, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html">AssociationConfig</a>.
+     * For information about CAPTCHA and Challenge configs, see <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html">CaptchaConfig</a>
      * and <a
      * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html">ChallengeConfig</a>
-     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> -
-     * Firewall Manager support for WAF managed rule group versioning </p> <p>
+     * in the <i>WAF API Reference</i>.</p> </li> <li> <p>
+     * <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web
+     * request body component that an associated Amazon CloudFront distribution should
+     * send to WAF for inspection. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit">DefaultSizeInspectionLimit</a>
+     * in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example:
+     * <code>WAFV2</code> - Firewall Manager support for WAF managed rule group
+     * versioning </p> <p>
      * <code>"{\"type\":\"WAFV2\",\"preProcessRuleGroups\":[{\"ruleGroupArn\":null,\"overrideAction\":{\"type\":\"NONE\"},\"managedRuleGroupIdentifier\":{\"versionEnabled\":true,\"version\":\"Version_2.0\",\"vendorName\":\"AWS\",\"managedRuleGroupName\":\"AWSManagedRulesCommonRuleSet\"},\"ruleGroupType\":\"ManagedRuleGroup\",\"excludeRules\":[{\"name\":\"NoUserAgent_HEADER\"}]}],\"postProcessRuleGroups\":[],\"defaultAction\":{\"type\":\"ALLOW\"},\"overrideCustomerWebACLAssociation\":false,\"loggingConfiguration\":{\"logDestinationConfigs\":[\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\"],\"redactedFields\":[{\"redactedFieldType\":\"SingleHeader\",\"redactedFieldValue\":\"Cookies\"},{\"redactedFieldType\":\"Method\"}]}}"</code>
      * </p> <p> To use a specific version of a WAF managed rule group in your Firewall
      * Manager policy, you must set <code>versionEnabled</code> to <code>true</code>,
diff --git a/generated/src/aws-cpp-sdk-fms/source/FMSEndpointRules.cpp b/generated/src/aws-cpp-sdk-fms/source/FMSEndpointRules.cpp
index e96a09b8468..b1355536183 100644
--- a/generated/src/aws-cpp-sdk-fms/source/FMSEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-fms/source/FMSEndpointRules.cpp
@@ -51,106 +51,106 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','f','m','s','-',
-'f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}',
-'"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r',
-'s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
-'r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r',
-'e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i',
-'t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',
-' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
-'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
-'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
-'t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c',
-'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
-'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
-'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
-'p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"',
-'t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':',
-'"','h','t','t','p','s',':','/','/','f','m','s','-','f','i','p','s','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
-'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
-'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
-'n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
-'e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e',
-'r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
 '"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
 'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
-'}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
+'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
 'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
 'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
 '"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
 'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c',
-'k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
-'f','m','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e',
-'s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',
-',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s',
-'"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',
-'}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r',
-'"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p',
-'e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n',
-'s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"',
-'h','t','t','p','s',':','/','/','f','m','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','f','m','s','-','f','i','p','s','.','{',
+'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
+'d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o',
+'p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',
+',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p',
+'e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
+'[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l',
+'S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h',
+'i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p',
+'p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
+'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f',
+'"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l',
+'e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',
+':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[',
+'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
+'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
+'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']','}',']',',',
+'"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',
+',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',
+':','/','/','f','m','s','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
 't','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',',
 '"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
+':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
+'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e',
+'n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"',
+'t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t',
+'r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
+'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
+'[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t',
+'r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i',
+'o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l',
+'s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e',
+'t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a',
+'r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s',
+'D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n',
+'t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','f','m','s','.','{','R',
+'e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d',
+'u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p',
+'e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',',
+'"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e',
+'"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
+']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e',
+'n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a',
+'c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p',
+'e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
+'[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t',
+'p','s',':','/','/','f','m','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r',
+'o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}',
+'}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
 'r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',
 ':',' ','M','i','s','s','i','n','g',' ','R','e','g','i','o','n','"',',','"','t','y','p','e','"',':',
 '"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-marketplace-entitlement/source/MarketplaceEntitlementServiceEndpointRules.cpp b/generated/src/aws-cpp-sdk-marketplace-entitlement/source/MarketplaceEntitlementServiceEndpointRules.cpp
index 3e0e0179049..909353ab234 100644
--- a/generated/src/aws-cpp-sdk-marketplace-entitlement/source/MarketplaceEntitlementServiceEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-marketplace-entitlement/source/MarketplaceEntitlementServiceEndpointRules.cpp
@@ -51,118 +51,118 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','e','n','t','i',
-'t','l','e','m','e','n','t','.','m','a','r','k','e','t','p','l','a','c','e','-','f','i','p','s','.',
-'{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
-'#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r',
-'o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}',
-'}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F',
-'I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a',
-'b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ',
-'d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b',
-'o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',
-':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
-'i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a',
-'l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g',
-'e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P',
-'a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t',
-'s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p',
-'s',':','/','/','e','n','t','i','t','l','e','m','e','n','t','.','m','a','r','k','e','t','p','l','a',
-'c','e','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
-'o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o',
-'p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',
-',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c',
-'o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I',
-'P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a',
-'r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ',
-'F','I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{',
-'"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l',
-'e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',
-':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',',
-'"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"',
-'f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r',
-'e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s',
-'u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
 '"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','e','n','t','i','t','l','e','m','e','n',
-'t','.','m','a','r','k','e','t','p','l','a','c','e','.','{','R','e','g','i','o','n','}','.','{','P',
-'a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D',
-'n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
-'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
-'n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',
-' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i',
-'o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S',
-'t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{',
-'"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i',
-'n','g','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','"','a','w','s','"',',','{',
-'"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"',
-'r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"',
-'n','a','m','e','"',']','}',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u',
-'r','l','"',':','"','h','t','t','p','s',':','/','/','e','n','t','i','t','l','e','m','e','n','t','.',
-'m','a','r','k','e','t','p','l','a','c','e','.','{','R','e','g','i','o','n','}','.','a','m','a','z',
-'o','n','a','w','s','.','c','o','m','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
-'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
-'n','d','p','o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p',
-'s',':','/','/','e','n','t','i','t','l','e','m','e','n','t','.','m','a','r','k','e','t','p','l','a',
-'c','e','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s',
-'u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i',
+'t','.','m','a','r','k','e','t','p','l','a','c','e','-','f','i','p','s','.','{','R','e','g','i','o',
+'n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S',
+'t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i',
 'e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p',
-'e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',']','}',',','{','"','c','o','n','d',
+'e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t',
+'r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
+'r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',
+' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a',
+'r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ',
+'o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
+'r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E',
+'q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s',
+'e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
+'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','f','n','"',
+':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',
+':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p',
+'o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e',
+'s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d',
+'p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','e','n',
+'t','i','t','l','e','m','e','n','t','.','m','a','r','k','e','t','p','l','a','c','e','-','f','i','p',
+'s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u',
+'l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e',
+'s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e',
+'"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r',
+'e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r',
+'r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',
+' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
+'s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r',
+'o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','r','u',
+'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
+'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
+'[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r',
+'g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s',
+'u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',
+']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o',
+'n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':',
+'"','h','t','t','p','s',':','/','/','e','n','t','i','t','l','e','m','e','n','t','.','m','a','r','k',
+'e','t','p','l','a','c','e','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
+'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
+'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
+'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
+'t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l',
+'S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',
+' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o',
+'r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r',
+'o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E',
+'q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','"','a','w','s','"',',','{','"','f','n',
+'"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f',
+'"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','n','a','m',
+'e','"',']','}',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',
+':','"','h','t','t','p','s',':','/','/','e','n','t','i','t','l','e','m','e','n','t','.','m','a','r',
+'k','e','t','p','l','a','c','e','.','{','R','e','g','i','o','n','}','.','a','m','a','z','o','n','a',
+'w','s','.','c','o','m','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"',
+'h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p',
+'o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/',
+'/','e','n','t','i','t','l','e','m','e','n','t','.','m','a','r','k','e','t','p','l','a','c','e','.',
+'{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',
+':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':',
+'"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
 'i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l',
 'i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',
 ' ','R','e','g','i','o','n','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AiffSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AiffSettings.h
index 143e3294d17..ce2b4eeafd9 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AiffSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AiffSettings.h
@@ -86,22 +86,22 @@ namespace Model
 
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline int GetSampleRate() const{ return m_sampleRate; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline bool SampleRateHasBeenSet() const { return m_sampleRateHasBeenSet; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline void SetSampleRate(int value) { m_sampleRateHasBeenSet = true; m_sampleRate = value; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline AiffSettings& WithSampleRate(int value) { SetSampleRate(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioChannelTaggingSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioChannelTaggingSettings.h
index 7fc5e770332..fedc0dc21e0 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioChannelTaggingSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioChannelTaggingSettings.h
@@ -6,6 +6,7 @@
 #pragma once
 #include <aws/mediaconvert/MediaConvert_EXPORTS.h>
 #include <aws/mediaconvert/model/AudioChannelTag.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
 #include <utility>
 
 namespace Aws
@@ -24,14 +25,11 @@ namespace Model
 {
 
   /**
-   * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-   * you can tag each channel layout manually. For example, you would tag the tracks
-   * that contain your left, right, and center audio with Left (L), Right (R), and
-   * Center (C), respectively. When you don't specify a value, MediaConvert labels
-   * your track as Center (C) by default. To use audio layout tagging, your output
-   * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-   * AIFF; and you must set up your audio track to have only one channel.<p><h3>See
-   * Also:</h3>   <a
+   * Specify the QuickTime audio channel layout tags for the audio channels in this
+   * audio track. When you don't specify a value, MediaConvert labels your track as
+   * Center (C) by default. To use Audio layout tagging, your output must be in a
+   * QuickTime (MOV) container and your audio codec must be AAC, WAV, or
+   * AIFF.<p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/AudioChannelTaggingSettings">AWS
    * API Reference</a></p>
    */
@@ -45,51 +43,153 @@ namespace Model
 
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline const AudioChannelTag& GetChannelTag() const{ return m_channelTag; }
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline bool ChannelTagHasBeenSet() const { return m_channelTagHasBeenSet; }
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline void SetChannelTag(const AudioChannelTag& value) { m_channelTagHasBeenSet = true; m_channelTag = value; }
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline void SetChannelTag(AudioChannelTag&& value) { m_channelTagHasBeenSet = true; m_channelTag = std::move(value); }
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline AudioChannelTaggingSettings& WithChannelTag(const AudioChannelTag& value) { SetChannelTag(value); return *this;}
 
     /**
-     * You can add a tag for this mono-channel audio track to mimic its placement in a
-     * multi-channel layout. For example, if this track is the left surround channel,
-     * choose Left surround (LS).
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
      */
     inline AudioChannelTaggingSettings& WithChannelTag(AudioChannelTag&& value) { SetChannelTag(std::move(value)); return *this;}
 
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline const Aws::Vector<AudioChannelTag>& GetChannelTags() const{ return m_channelTags; }
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline bool ChannelTagsHasBeenSet() const { return m_channelTagsHasBeenSet; }
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline void SetChannelTags(const Aws::Vector<AudioChannelTag>& value) { m_channelTagsHasBeenSet = true; m_channelTags = value; }
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline void SetChannelTags(Aws::Vector<AudioChannelTag>&& value) { m_channelTagsHasBeenSet = true; m_channelTags = std::move(value); }
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline AudioChannelTaggingSettings& WithChannelTags(const Aws::Vector<AudioChannelTag>& value) { SetChannelTags(value); return *this;}
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline AudioChannelTaggingSettings& WithChannelTags(Aws::Vector<AudioChannelTag>&& value) { SetChannelTags(std::move(value)); return *this;}
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline AudioChannelTaggingSettings& AddChannelTags(const AudioChannelTag& value) { m_channelTagsHasBeenSet = true; m_channelTags.push_back(value); return *this; }
+
+    /**
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. Enter channel layout tags in the same order as your output's audio
+     * channel order. For example, if your output audio track has a left and a right
+     * channel, enter Left (L) for the first channel and Right (R) for the second. If
+     * your output has multiple single-channel audio tracks, enter a single channel
+     * layout tag for each track.
+     */
+    inline AudioChannelTaggingSettings& AddChannelTags(AudioChannelTag&& value) { m_channelTagsHasBeenSet = true; m_channelTags.push_back(std::move(value)); return *this; }
+
   private:
 
     AudioChannelTag m_channelTag;
     bool m_channelTagHasBeenSet = false;
+
+    Aws::Vector<AudioChannelTag> m_channelTags;
+    bool m_channelTagsHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioDescription.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioDescription.h
index b47f725e992..557d5936e8a 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioDescription.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioDescription.h
@@ -50,68 +50,50 @@ namespace Model
 
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline const AudioChannelTaggingSettings& GetAudioChannelTaggingSettings() const{ return m_audioChannelTaggingSettings; }
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline bool AudioChannelTaggingSettingsHasBeenSet() const { return m_audioChannelTaggingSettingsHasBeenSet; }
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline void SetAudioChannelTaggingSettings(const AudioChannelTaggingSettings& value) { m_audioChannelTaggingSettingsHasBeenSet = true; m_audioChannelTaggingSettings = value; }
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline void SetAudioChannelTaggingSettings(AudioChannelTaggingSettings&& value) { m_audioChannelTaggingSettingsHasBeenSet = true; m_audioChannelTaggingSettings = std::move(value); }
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline AudioDescription& WithAudioChannelTaggingSettings(const AudioChannelTaggingSettings& value) { SetAudioChannelTaggingSettings(value); return *this;}
 
     /**
-     * When you mimic a multi-channel audio layout with multiple mono-channel tracks,
-     * you can tag each channel layout manually. For example, you would tag the tracks
-     * that contain your left, right, and center audio with Left (L), Right (R), and
-     * Center (C), respectively. When you don't specify a value, MediaConvert labels
-     * your track as Center (C) by default. To use audio layout tagging, your output
-     * must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or
-     * AIFF; and you must set up your audio track to have only one channel.
+     * Specify the QuickTime audio channel layout tags for the audio channels in this
+     * audio track. When you don't specify a value, MediaConvert labels your track as
+     * Center (C) by default. To use Audio layout tagging, your output must be in a
+     * QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF.
      */
     inline AudioDescription& WithAudioChannelTaggingSettings(AudioChannelTaggingSettings&& value) { SetAudioChannelTaggingSettings(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/F4vSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/F4vSettings.h
index b6c6dbae3fc..a4721b3c924 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/F4vSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/F4vSettings.h
@@ -38,44 +38,44 @@ namespace Model
 
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline const F4vMoovPlacement& GetMoovPlacement() const{ return m_moovPlacement; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline bool MoovPlacementHasBeenSet() const { return m_moovPlacementHasBeenSet; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline void SetMoovPlacement(const F4vMoovPlacement& value) { m_moovPlacementHasBeenSet = true; m_moovPlacement = value; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline void SetMoovPlacement(F4vMoovPlacement&& value) { m_moovPlacementHasBeenSet = true; m_moovPlacement = std::move(value); }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline F4vSettings& WithMoovPlacement(const F4vMoovPlacement& value) { SetMoovPlacement(value); return *this;}
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline F4vSettings& WithMoovPlacement(F4vMoovPlacement&& value) { SetMoovPlacement(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/FlacSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/FlacSettings.h
index 8a596f1044d..32c6feeeec5 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/FlacSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/FlacSettings.h
@@ -91,22 +91,22 @@ namespace Model
 
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline int GetSampleRate() const{ return m_sampleRate; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline bool SampleRateHasBeenSet() const { return m_sampleRateHasBeenSet; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline void SetSampleRate(int value) { m_sampleRateHasBeenSet = true; m_sampleRate = value; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline FlacSettings& WithSampleRate(int value) { SetSampleRate(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobSettings.h
index 92ac0e599c8..a5b125b9dae 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobSettings.h
@@ -203,6 +203,55 @@ namespace Model
     inline JobSettings& WithExtendedDataServices(ExtendedDataServices&& value) { SetExtendedDataServices(std::move(value)); return *this;}
 
 
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline int GetFollowSource() const{ return m_followSource; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline bool FollowSourceHasBeenSet() const { return m_followSourceHasBeenSet; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline void SetFollowSource(int value) { m_followSourceHasBeenSet = true; m_followSource = value; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline JobSettings& WithFollowSource(int value) { SetFollowSource(value); return *this;}
+
+
     /**
      * Use Inputs to define source file used in the transcode job. There can be
      * multiple inputs add in a job. These inputs will be concantenated together to
@@ -670,6 +719,9 @@ namespace Model
     ExtendedDataServices m_extendedDataServices;
     bool m_extendedDataServicesHasBeenSet = false;
 
+    int m_followSource;
+    bool m_followSourceHasBeenSet = false;
+
     Aws::Vector<Input> m_inputs;
     bool m_inputsHasBeenSet = false;
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobTemplateSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobTemplateSettings.h
index 2d947100383..488ca3d1207 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobTemplateSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/JobTemplateSettings.h
@@ -203,6 +203,55 @@ namespace Model
     inline JobTemplateSettings& WithExtendedDataServices(ExtendedDataServices&& value) { SetExtendedDataServices(std::move(value)); return *this;}
 
 
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline int GetFollowSource() const{ return m_followSource; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline bool FollowSourceHasBeenSet() const { return m_followSourceHasBeenSet; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline void SetFollowSource(int value) { m_followSourceHasBeenSet = true; m_followSource = value; }
+
+    /**
+     * Specify the input that MediaConvert references for your default output settings.
+     * MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio
+     * for all  outputs that you don't manually specify different output settings for.
+     * Enabling this setting will disable "Follow source" for all other inputs.  If
+     * MediaConvert cannot follow your source, for example if you specify an audio-only
+     * input,  MediaConvert uses the first followable input instead. In your JSON job
+     * specification, enter an integer from 1 to 150 corresponding  to the order of
+     * your inputs.
+     */
+    inline JobTemplateSettings& WithFollowSource(int value) { SetFollowSource(value); return *this;}
+
+
     /**
      * Use Inputs to define the source file used in the transcode job. There can only
      * be one input in a job template. Using the API, you can include multiple inputs
@@ -670,6 +719,9 @@ namespace Model
     ExtendedDataServices m_extendedDataServices;
     bool m_extendedDataServicesHasBeenSet = false;
 
+    int m_followSource;
+    bool m_followSourceHasBeenSet = false;
+
     Aws::Vector<InputTemplate> m_inputs;
     bool m_inputsHasBeenSet = false;
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp2Settings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp2Settings.h
index d2d7a6e433d..ff5429f97f7 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp2Settings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp2Settings.h
@@ -86,22 +86,22 @@ namespace Model
 
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline int GetSampleRate() const{ return m_sampleRate; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline bool SampleRateHasBeenSet() const { return m_sampleRateHasBeenSet; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline void SetSampleRate(int value) { m_sampleRateHasBeenSet = true; m_sampleRate = value; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline Mp2Settings& WithSampleRate(int value) { SetSampleRate(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp3Settings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp3Settings.h
index cb16f6853cb..c2d07a0d444 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp3Settings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp3Settings.h
@@ -126,22 +126,22 @@ namespace Model
 
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline int GetSampleRate() const{ return m_sampleRate; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline bool SampleRateHasBeenSet() const { return m_sampleRateHasBeenSet; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline void SetSampleRate(int value) { m_sampleRateHasBeenSet = true; m_sampleRate = value; }
 
     /**
-     * Sample rate in hz.
+     * Sample rate in Hz.
      */
     inline Mp3Settings& WithSampleRate(int value) { SetSampleRate(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp4Settings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp4Settings.h
index 623112fc478..2d76129dc7b 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp4Settings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/Mp4Settings.h
@@ -263,44 +263,44 @@ namespace Model
 
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline const Mp4MoovPlacement& GetMoovPlacement() const{ return m_moovPlacement; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline bool MoovPlacementHasBeenSet() const { return m_moovPlacementHasBeenSet; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline void SetMoovPlacement(const Mp4MoovPlacement& value) { m_moovPlacementHasBeenSet = true; m_moovPlacement = value; }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline void SetMoovPlacement(Mp4MoovPlacement&& value) { m_moovPlacementHasBeenSet = true; m_moovPlacement = std::move(value); }
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline Mp4Settings& WithMoovPlacement(const Mp4MoovPlacement& value) { SetMoovPlacement(value); return *this;}
 
     /**
-     * If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of
-     * the archive as required for progressive downloading. Otherwise it is placed
-     * normally at the end.
+     * To place the MOOV atom at the beginning of your output, which is useful for
+     * progressive downloading: Leave blank or choose Progressive download. To place
+     * the MOOV at the end of your output: Choose Normal.
      */
     inline Mp4Settings& WithMoovPlacement(Mp4MoovPlacement&& value) { SetMoovPlacement(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/OpusSettings.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/OpusSettings.h
index 0bbb616d2d0..4c4d531b20e 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/OpusSettings.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/OpusSettings.h
@@ -95,25 +95,25 @@ namespace Model
 
 
     /**
-     * Optional. Sample rate in hz. Valid values are 16000, 24000, and 48000. The
+     * Optional. Sample rate in Hz. Valid values are 16000, 24000, and 48000. The
      * default value is 48000.
      */
     inline int GetSampleRate() const{ return m_sampleRate; }
 
     /**
-     * Optional. Sample rate in hz. Valid values are 16000, 24000, and 48000. The
+     * Optional. Sample rate in Hz. Valid values are 16000, 24000, and 48000. The
      * default value is 48000.
      */
     inline bool SampleRateHasBeenSet() const { return m_sampleRateHasBeenSet; }
 
     /**
-     * Optional. Sample rate in hz. Valid values are 16000, 24000, and 48000. The
+     * Optional. Sample rate in Hz. Valid values are 16000, 24000, and 48000. The
      * default value is 48000.
      */
     inline void SetSampleRate(int value) { m_sampleRateHasBeenSet = true; m_sampleRate = value; }
 
     /**
-     * Optional. Sample rate in hz. Valid values are 16000, 24000, and 48000. The
+     * Optional. Sample rate in Hz. Valid values are 16000, 24000, and 48000. The
      * default value is 48000.
      */
     inline OpusSettings& WithSampleRate(int value) { SetSampleRate(value); return *this;}
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/ScalingBehavior.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/ScalingBehavior.h
index 61d76d8d1fe..776fa1d5c84 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/ScalingBehavior.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/ScalingBehavior.h
@@ -17,7 +17,10 @@ namespace Model
   {
     NOT_SET,
     DEFAULT,
-    STRETCH_TO_OUTPUT
+    STRETCH_TO_OUTPUT,
+    FIT,
+    FIT_NO_UPSCALE,
+    FILL
   };
 
 namespace ScalingBehaviorMapper
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoDescription.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoDescription.h
index 048b6075d45..d642fbb6d5c 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoDescription.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoDescription.h
@@ -520,56 +520,44 @@ namespace Model
 
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline const ScalingBehavior& GetScalingBehavior() const{ return m_scalingBehavior; }
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline bool ScalingBehaviorHasBeenSet() const { return m_scalingBehaviorHasBeenSet; }
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline void SetScalingBehavior(const ScalingBehavior& value) { m_scalingBehaviorHasBeenSet = true; m_scalingBehavior = value; }
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline void SetScalingBehavior(ScalingBehavior&& value) { m_scalingBehaviorHasBeenSet = true; m_scalingBehavior = std::move(value); }
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline VideoDescription& WithScalingBehavior(const ScalingBehavior& value) { SetScalingBehavior(value); return *this;}
 
     /**
-     * Specify how the service handles outputs that have a different aspect ratio from
-     * the input aspect ratio. Choose Stretch to output to have the service stretch
-     * your video image to fit. Keep the setting Default to have the service letterbox
-     * your video instead. This setting overrides any value that you specify for the
-     * setting Selection placement in this output.
+     * Specify the video Scaling behavior when your output has a different resolution
+     * than your input. For more information, see
+     * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html
      */
     inline VideoDescription& WithScalingBehavior(ScalingBehavior&& value) { SetScalingBehavior(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlay.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlay.h
index f16a746c694..4eabcabc8eb 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlay.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlay.h
@@ -25,7 +25,9 @@ namespace Model
 {
 
   /**
-   * Overlay one or more videos on top of your input video.<p><h3>See Also:</h3>   <a
+   * Overlay one or more videos on top of your input video. For more information, see
+   * https://docs.aws.amazon.com/mediaconvert/latest/ug/video-overlays.html<p><h3>See
+   * Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/VideoOverlay">AWS
    * API Reference</a></p>
    */
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlayInput.h b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlayInput.h
index 6de21fe116a..96b77b6a566 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlayInput.h
+++ b/generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/VideoOverlayInput.h
@@ -164,56 +164,56 @@ namespace Model
 
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline const InputTimecodeSource& GetTimecodeSource() const{ return m_timecodeSource; }
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline bool TimecodeSourceHasBeenSet() const { return m_timecodeSourceHasBeenSet; }
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline void SetTimecodeSource(const InputTimecodeSource& value) { m_timecodeSourceHasBeenSet = true; m_timecodeSource = value; }
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline void SetTimecodeSource(InputTimecodeSource&& value) { m_timecodeSourceHasBeenSet = true; m_timecodeSource = std::move(value); }
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline VideoOverlayInput& WithTimecodeSource(const InputTimecodeSource& value) { SetTimecodeSource(value); return *this;}
 
     /**
-     * Specify the starting timecode for your video overlay. To use the timecode
-     * present in your video overlay: Choose Embedded. To use a zerobased timecode:
-     * Choose Start at 0. To choose a timecode: Choose Specified start. When you do,
-     * enter the starting timecode in Start timecode. If you don't specify a value for
-     * Timecode source, MediaConvert uses Embedded by default.
+     * Specify the timecode source for your video overlay input clips. To use the
+     * timecode present in your video overlay: Choose Embedded. To use a zerobased
+     * timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When
+     * you do, enter the starting timecode in Start timecode. If you don't specify a
+     * value for Timecode source, MediaConvert uses Embedded by default.
      */
     inline VideoOverlayInput& WithTimecodeSource(InputTimecodeSource&& value) { SetTimecodeSource(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/source/MediaConvertEndpointRules.cpp b/generated/src/aws-cpp-sdk-mediaconvert/source/MediaConvertEndpointRules.cpp
index 2b2cf60cd96..bb227e67cfb 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/source/MediaConvertEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-mediaconvert/source/MediaConvertEndpointRules.cpp
@@ -51,125 +51,125 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i',
-'a','c','o','n','v','e','r','t','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P',
-'a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D',
-'n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
-'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
-'n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a',
-'l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t',
-'h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u',
-'p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',
-':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
-'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',',
-'t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s',
-'u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',
-',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{',
-'"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i',
-'n','g','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','"','a','w','s','-','u','s',
-'-','g','o','v','"',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s',
-'u','l','t','"','}',',','"','n','a','m','e','"',']','}',']','}',']',',','"','e','n','d','p','o','i',
-'n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i','a',
-'c','o','n','v','e','r','t','.','{','R','e','g','i','o','n','}','.','a','m','a','z','o','n','a','w',
-'s','.','c','o','m','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h',
-'e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o',
-'i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
-'m','e','d','i','a','c','o','n','v','e','r','t','-','f','i','p','s','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
-'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
-'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
-'n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
-'e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e',
-'r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
 '"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
 'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
-'}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
+'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
 'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
 'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
 '"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
 'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c',
-'k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
-'m','e','d','i','a','c','o','n','v','e','r','t','.','{','R','e','g','i','o','n','}','.','{','P','a',
-'r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n',
-'s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',
-',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n',
-'d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
-'[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ',
-'e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o',
-'n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t',
-'a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n',
-'g','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"',
-'R','e','g','i','o','n','"','}',',','"','c','n','-','n','o','r','t','h','w','e','s','t','-','1','"',
-']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p','s',':','/','/','s','u','b','s','c','r','i','b','e','.','m','e','d','i','a','c','o','n','v',
-'e','r','t','.','c','n','-','n','o','r','t','h','w','e','s','t','-','1','.','a','m','a','z','o','n',
-'a','w','s','.','c','o','m','.','c','n','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
-'[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t',
-'p','s',':','/','/','m','e','d','i','a','c','o','n','v','e','r','t','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
-'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
-'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
-'n','t','"','}',']','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i','a','c','o','n','v','e',
+'r','t','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
+'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
+'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
+'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
+'t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',
+' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e',
+'d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e',
+'s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h',
+'"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',
+':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u',
+'e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
+',','"','a','r','g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',',
+'"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n',
+'R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',
+',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E','q','u','a',
+'l','s','"',',','"','a','r','g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','n','a','m','e','"',']','}',',','"','a','w','s',
+'-','u','s','-','g','o','v','"',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"',
+'u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i','a','c','o','n','v','e','r',
+'t','.','{','R','e','g','i','o','n','}','.','a','m','a','z','o','n','a','w','s','.','c','o','m','"',
+',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s',
+'"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',',',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n',
+'t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i','a','c',
+'o','n','v','e','r','t','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
+'t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',',
+'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
+':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
+'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e',
+'n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"',
+'t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t',
+'r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
+'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
+'[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t',
+'r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i',
+'o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l',
+'s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e',
+'t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a',
+'r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s',
+'D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n',
+'t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','m','e','d','i','a','c',
+'o','n','v','e','r','t','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o',
+'n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i',
+'x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d',
+'e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
+'i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S',
+'t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ',
+'p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r',
+'t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
+'r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E','q',
+'u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g',
+'i','o','n','"','}',',','"','c','n','-','n','o','r','t','h','w','e','s','t','-','1','"',']','}',']',
+',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',
+':','/','/','s','u','b','s','c','r','i','b','e','.','m','e','d','i','a','c','o','n','v','e','r','t',
+'.','c','n','-','n','o','r','t','h','w','e','s','t','-','1','.','a','m','a','z','o','n','a','w','s',
+'.','c','o','m','.','c','n','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',',
+'"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':',
+'/','/','m','e','d','i','a','c','o','n','v','e','r','t','.','{','R','e','g','i','o','n','}','.','{',
+'P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x',
+'}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e',
+'r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"',
+'}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',
+':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',
 ',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u',
 'r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g','i','o','n','"',',','"',
 't','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/source/model/AudioChannelTaggingSettings.cpp b/generated/src/aws-cpp-sdk-mediaconvert/source/model/AudioChannelTaggingSettings.cpp
index 369ea609645..c3474aab4d8 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/source/model/AudioChannelTaggingSettings.cpp
+++ b/generated/src/aws-cpp-sdk-mediaconvert/source/model/AudioChannelTaggingSettings.cpp
@@ -20,13 +20,15 @@ namespace Model
 
 AudioChannelTaggingSettings::AudioChannelTaggingSettings() : 
     m_channelTag(AudioChannelTag::NOT_SET),
-    m_channelTagHasBeenSet(false)
+    m_channelTagHasBeenSet(false),
+    m_channelTagsHasBeenSet(false)
 {
 }
 
 AudioChannelTaggingSettings::AudioChannelTaggingSettings(JsonView jsonValue) : 
     m_channelTag(AudioChannelTag::NOT_SET),
-    m_channelTagHasBeenSet(false)
+    m_channelTagHasBeenSet(false),
+    m_channelTagsHasBeenSet(false)
 {
   *this = jsonValue;
 }
@@ -40,6 +42,16 @@ AudioChannelTaggingSettings& AudioChannelTaggingSettings::operator =(JsonView js
     m_channelTagHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("channelTags"))
+  {
+    Aws::Utils::Array<JsonView> channelTagsJsonList = jsonValue.GetArray("channelTags");
+    for(unsigned channelTagsIndex = 0; channelTagsIndex < channelTagsJsonList.GetLength(); ++channelTagsIndex)
+    {
+      m_channelTags.push_back(AudioChannelTagMapper::GetAudioChannelTagForName(channelTagsJsonList[channelTagsIndex].AsString()));
+    }
+    m_channelTagsHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -52,6 +64,17 @@ JsonValue AudioChannelTaggingSettings::Jsonize() const
    payload.WithString("channelTag", AudioChannelTagMapper::GetNameForAudioChannelTag(m_channelTag));
   }
 
+  if(m_channelTagsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> channelTagsJsonList(m_channelTags.size());
+   for(unsigned channelTagsIndex = 0; channelTagsIndex < channelTagsJsonList.GetLength(); ++channelTagsIndex)
+   {
+     channelTagsJsonList[channelTagsIndex].AsString(AudioChannelTagMapper::GetNameForAudioChannelTag(m_channelTags[channelTagsIndex]));
+   }
+   payload.WithArray("channelTags", std::move(channelTagsJsonList));
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobSettings.cpp b/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobSettings.cpp
index d5459555563..6dfb4510230 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobSettings.cpp
+++ b/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobSettings.cpp
@@ -24,6 +24,8 @@ JobSettings::JobSettings() :
     m_availBlankingHasBeenSet(false),
     m_esamHasBeenSet(false),
     m_extendedDataServicesHasBeenSet(false),
+    m_followSource(0),
+    m_followSourceHasBeenSet(false),
     m_inputsHasBeenSet(false),
     m_kantarWatermarkHasBeenSet(false),
     m_motionImageInserterHasBeenSet(false),
@@ -41,6 +43,8 @@ JobSettings::JobSettings(JsonView jsonValue) :
     m_availBlankingHasBeenSet(false),
     m_esamHasBeenSet(false),
     m_extendedDataServicesHasBeenSet(false),
+    m_followSource(0),
+    m_followSourceHasBeenSet(false),
     m_inputsHasBeenSet(false),
     m_kantarWatermarkHasBeenSet(false),
     m_motionImageInserterHasBeenSet(false),
@@ -83,6 +87,13 @@ JobSettings& JobSettings::operator =(JsonView jsonValue)
     m_extendedDataServicesHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("followSource"))
+  {
+    m_followSource = jsonValue.GetInteger("followSource");
+
+    m_followSourceHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("inputs"))
   {
     Aws::Utils::Array<JsonView> inputsJsonList = jsonValue.GetArray("inputs");
@@ -176,6 +187,12 @@ JsonValue JobSettings::Jsonize() const
 
   }
 
+  if(m_followSourceHasBeenSet)
+  {
+   payload.WithInteger("followSource", m_followSource);
+
+  }
+
   if(m_inputsHasBeenSet)
   {
    Aws::Utils::Array<JsonValue> inputsJsonList(m_inputs.size());
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobTemplateSettings.cpp b/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobTemplateSettings.cpp
index 95932edaebe..ab2aa7d6b62 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobTemplateSettings.cpp
+++ b/generated/src/aws-cpp-sdk-mediaconvert/source/model/JobTemplateSettings.cpp
@@ -24,6 +24,8 @@ JobTemplateSettings::JobTemplateSettings() :
     m_availBlankingHasBeenSet(false),
     m_esamHasBeenSet(false),
     m_extendedDataServicesHasBeenSet(false),
+    m_followSource(0),
+    m_followSourceHasBeenSet(false),
     m_inputsHasBeenSet(false),
     m_kantarWatermarkHasBeenSet(false),
     m_motionImageInserterHasBeenSet(false),
@@ -41,6 +43,8 @@ JobTemplateSettings::JobTemplateSettings(JsonView jsonValue) :
     m_availBlankingHasBeenSet(false),
     m_esamHasBeenSet(false),
     m_extendedDataServicesHasBeenSet(false),
+    m_followSource(0),
+    m_followSourceHasBeenSet(false),
     m_inputsHasBeenSet(false),
     m_kantarWatermarkHasBeenSet(false),
     m_motionImageInserterHasBeenSet(false),
@@ -83,6 +87,13 @@ JobTemplateSettings& JobTemplateSettings::operator =(JsonView jsonValue)
     m_extendedDataServicesHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("followSource"))
+  {
+    m_followSource = jsonValue.GetInteger("followSource");
+
+    m_followSourceHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("inputs"))
   {
     Aws::Utils::Array<JsonView> inputsJsonList = jsonValue.GetArray("inputs");
@@ -176,6 +187,12 @@ JsonValue JobTemplateSettings::Jsonize() const
 
   }
 
+  if(m_followSourceHasBeenSet)
+  {
+   payload.WithInteger("followSource", m_followSource);
+
+  }
+
   if(m_inputsHasBeenSet)
   {
    Aws::Utils::Array<JsonValue> inputsJsonList(m_inputs.size());
diff --git a/generated/src/aws-cpp-sdk-mediaconvert/source/model/ScalingBehavior.cpp b/generated/src/aws-cpp-sdk-mediaconvert/source/model/ScalingBehavior.cpp
index 6804339bc6b..0b964301bb6 100644
--- a/generated/src/aws-cpp-sdk-mediaconvert/source/model/ScalingBehavior.cpp
+++ b/generated/src/aws-cpp-sdk-mediaconvert/source/model/ScalingBehavior.cpp
@@ -22,6 +22,9 @@ namespace Aws
 
         static const int DEFAULT_HASH = HashingUtils::HashString("DEFAULT");
         static const int STRETCH_TO_OUTPUT_HASH = HashingUtils::HashString("STRETCH_TO_OUTPUT");
+        static const int FIT_HASH = HashingUtils::HashString("FIT");
+        static const int FIT_NO_UPSCALE_HASH = HashingUtils::HashString("FIT_NO_UPSCALE");
+        static const int FILL_HASH = HashingUtils::HashString("FILL");
 
 
         ScalingBehavior GetScalingBehaviorForName(const Aws::String& name)
@@ -35,6 +38,18 @@ namespace Aws
           {
             return ScalingBehavior::STRETCH_TO_OUTPUT;
           }
+          else if (hashCode == FIT_HASH)
+          {
+            return ScalingBehavior::FIT;
+          }
+          else if (hashCode == FIT_NO_UPSCALE_HASH)
+          {
+            return ScalingBehavior::FIT_NO_UPSCALE;
+          }
+          else if (hashCode == FILL_HASH)
+          {
+            return ScalingBehavior::FILL;
+          }
           EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
           if(overflowContainer)
           {
@@ -55,6 +70,12 @@ namespace Aws
             return "DEFAULT";
           case ScalingBehavior::STRETCH_TO_OUTPUT:
             return "STRETCH_TO_OUTPUT";
+          case ScalingBehavior::FIT:
+            return "FIT";
+          case ScalingBehavior::FIT_NO_UPSCALE:
+            return "FIT_NO_UPSCALE";
+          case ScalingBehavior::FILL:
+            return "FILL";
           default:
             EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
             if(overflowContainer)
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/RDSClient.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/RDSClient.h
index eee76c41cc0..99fd6027d5d 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/RDSClient.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/RDSClient.h
@@ -1106,11 +1106,8 @@ namespace Aws
         }
 
         /**
-         * <p>Creates a zero-ETL integration with Amazon Redshift. For more information,
-         * see <a
-         * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html">Working
-         * with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the
-         * <i>Amazon Aurora User Guide</i>.</p><p><h3>See Also:</h3>   <a
+         * <p>Creates a zero-ETL integration with Amazon Redshift.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/CreateIntegration">AWS
          * API Reference</a></p>
          */
@@ -1711,11 +1708,8 @@ namespace Aws
         }
 
         /**
-         * <p>Deletes a zero-ETL integration with Amazon Redshift. For more information,
-         * see <a
-         * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.deleting.html">Deleting
-         * Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the <i>Amazon
-         * Aurora User Guide</i> </p><p><h3>See Also:</h3>   <a
+         * <p>Deletes a zero-ETL integration with Amazon Redshift.</p><p><h3>See Also:</h3>
+         * <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/DeleteIntegration">AWS
          * API Reference</a></p>
          */
@@ -2796,11 +2790,8 @@ namespace Aws
         }
 
         /**
-         * <p>Describe one or more zero-ETL integration with Amazon Redshift. For more
-         * information, see <a
-         * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.describingmonitoring.html">Viewing
-         * and monitoring Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in
-         * the <i>Amazon Aurora User Guide</i> </p><p><h3>See Also:</h3>   <a
+         * <p>Describe one or more zero-ETL integrations with Amazon
+         * Redshift.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/DescribeIntegrations">AWS
          * API Reference</a></p>
          */
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateCustomDBEngineVersionResult.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateCustomDBEngineVersionResult.h
index a453db75635..1b70af321fd 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateCustomDBEngineVersionResult.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateCustomDBEngineVersionResult.h
@@ -1324,20 +1324,20 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool GetSupportsIntegrations() const{ return m_supportsIntegrations; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline void SetSupportsIntegrations(bool value) { m_supportsIntegrations = value; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline CreateCustomDBEngineVersionResult& WithSupportsIntegrations(bool value) { SetSupportsIntegrations(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationRequest.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationRequest.h
index 4839f4826d8..338219bb770 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationRequest.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationRequest.h
@@ -40,50 +40,50 @@ namespace Model
   public:
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline const Aws::String& GetSourceArn() const{ return m_sourceArn; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline bool SourceArnHasBeenSet() const { return m_sourceArnHasBeenSet; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const Aws::String& value) { m_sourceArnHasBeenSet = true; m_sourceArn = value; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(Aws::String&& value) { m_sourceArnHasBeenSet = true; m_sourceArn = std::move(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const char* value) { m_sourceArnHasBeenSet = true; m_sourceArn.assign(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline CreateIntegrationRequest& WithSourceArn(const Aws::String& value) { SetSourceArn(value); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline CreateIntegrationRequest& WithSourceArn(Aws::String&& value) { SetSourceArn(std::move(value)); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database to use as the source for
+     * replication.</p>
      */
     inline CreateIntegrationRequest& WithSourceArn(const char* value) { SetSourceArn(value); return *this;}
 
@@ -181,56 +181,56 @@ namespace Model
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline const Aws::String& GetKMSKeyId() const{ return m_kMSKeyId; }
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline bool KMSKeyIdHasBeenSet() const { return m_kMSKeyIdHasBeenSet; }
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline void SetKMSKeyId(const Aws::String& value) { m_kMSKeyIdHasBeenSet = true; m_kMSKeyId = value; }
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline void SetKMSKeyId(Aws::String&& value) { m_kMSKeyIdHasBeenSet = true; m_kMSKeyId = std::move(value); }
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline void SetKMSKeyId(const char* value) { m_kMSKeyIdHasBeenSet = true; m_kMSKeyId.assign(value); }
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline CreateIntegrationRequest& WithKMSKeyId(const Aws::String& value) { SetKMSKeyId(value); return *this;}
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline CreateIntegrationRequest& WithKMSKeyId(Aws::String&& value) { SetKMSKeyId(std::move(value)); return *this;}
 
     /**
      * <p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key
      * identifier for the key to use to encrypt the integration. If you don't specify
-     * an encryption key, Aurora uses a default Amazon Web Services owned key. </p>
+     * an encryption key, RDS uses a default Amazon Web Services owned key. </p>
      */
     inline CreateIntegrationRequest& WithKMSKeyId(const char* value) { SetKMSKeyId(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationResult.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationResult.h
index e2925e8a670..cb58473de48 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationResult.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateIntegrationResult.h
@@ -32,11 +32,7 @@ namespace RDS
 namespace Model
 {
   /**
-   * <p>An Aurora zero-ETL integration with Amazon Redshift. For more information,
-   * see <a
-   * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html">Working
-   * with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the
-   * <i>Amazon Aurora User Guide</i>.</p><p><h3>See Also:</h3>   <a
+   * <p>A zero-ETL integration with Amazon Redshift.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/Integration">AWS API
    * Reference</a></p>
    */
@@ -49,44 +45,44 @@ namespace Model
 
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline const Aws::String& GetSourceArn() const{ return m_sourceArn; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const Aws::String& value) { m_sourceArn = value; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(Aws::String&& value) { m_sourceArn = std::move(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const char* value) { m_sourceArn.assign(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline CreateIntegrationResult& WithSourceArn(const Aws::String& value) { SetSourceArn(value); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline CreateIntegrationResult& WithSourceArn(Aws::String&& value) { SetSourceArn(std::move(value)); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline CreateIntegrationResult& WithSourceArn(const char* value) { SetSourceArn(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBEngineVersion.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBEngineVersion.h
index 7a71e724798..3f072a4cca5 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBEngineVersion.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBEngineVersion.h
@@ -1528,26 +1528,26 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool GetSupportsIntegrations() const{ return m_supportsIntegrations; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool SupportsIntegrationsHasBeenSet() const { return m_supportsIntegrationsHasBeenSet; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline void SetSupportsIntegrations(bool value) { m_supportsIntegrationsHasBeenSet = true; m_supportsIntegrations = value; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline DBEngineVersion& WithSupportsIntegrations(bool value) { SetSupportsIntegrations(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteCustomDBEngineVersionResult.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteCustomDBEngineVersionResult.h
index 6ede2257e4c..487c3421ec1 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteCustomDBEngineVersionResult.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteCustomDBEngineVersionResult.h
@@ -1324,20 +1324,20 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool GetSupportsIntegrations() const{ return m_supportsIntegrations; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline void SetSupportsIntegrations(bool value) { m_supportsIntegrations = value; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline DeleteCustomDBEngineVersionResult& WithSupportsIntegrations(bool value) { SetSupportsIntegrations(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteIntegrationResult.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteIntegrationResult.h
index e8e210dce4e..6b0eb6d5140 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteIntegrationResult.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DeleteIntegrationResult.h
@@ -32,11 +32,7 @@ namespace RDS
 namespace Model
 {
   /**
-   * <p>An Aurora zero-ETL integration with Amazon Redshift. For more information,
-   * see <a
-   * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html">Working
-   * with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the
-   * <i>Amazon Aurora User Guide</i>.</p><p><h3>See Also:</h3>   <a
+   * <p>A zero-ETL integration with Amazon Redshift.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/Integration">AWS API
    * Reference</a></p>
    */
@@ -49,44 +45,44 @@ namespace Model
 
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline const Aws::String& GetSourceArn() const{ return m_sourceArn; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const Aws::String& value) { m_sourceArn = value; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(Aws::String&& value) { m_sourceArn = std::move(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const char* value) { m_sourceArn.assign(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline DeleteIntegrationResult& WithSourceArn(const Aws::String& value) { SetSourceArn(value); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline DeleteIntegrationResult& WithSourceArn(Aws::String&& value) { SetSourceArn(std::move(value)); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline DeleteIntegrationResult& WithSourceArn(const char* value) { SetSourceArn(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/Integration.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/Integration.h
index 9fb62073e22..c258044e32c 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/Integration.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/Integration.h
@@ -31,11 +31,7 @@ namespace Model
 {
 
   /**
-   * <p>An Aurora zero-ETL integration with Amazon Redshift. For more information,
-   * see <a
-   * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html">Working
-   * with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the
-   * <i>Amazon Aurora User Guide</i>.</p><p><h3>See Also:</h3>   <a
+   * <p>A zero-ETL integration with Amazon Redshift.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/Integration">AWS API
    * Reference</a></p>
    */
@@ -51,50 +47,50 @@ namespace Model
 
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline const Aws::String& GetSourceArn() const{ return m_sourceArn; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline bool SourceArnHasBeenSet() const { return m_sourceArnHasBeenSet; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const Aws::String& value) { m_sourceArnHasBeenSet = true; m_sourceArn = value; }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(Aws::String&& value) { m_sourceArnHasBeenSet = true; m_sourceArn = std::move(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline void SetSourceArn(const char* value) { m_sourceArnHasBeenSet = true; m_sourceArn.assign(value); }
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline Integration& WithSourceArn(const Aws::String& value) { SetSourceArn(value); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline Integration& WithSourceArn(Aws::String&& value) { SetSourceArn(std::move(value)); return *this;}
 
     /**
-     * <p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source
-     * for replication.</p>
+     * <p>The Amazon Resource Name (ARN) of the database used as the source for
+     * replication.</p>
      */
     inline Integration& WithSourceArn(const char* value) { SetSourceArn(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/ModifyCustomDBEngineVersionResult.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/ModifyCustomDBEngineVersionResult.h
index 801e5e0fc1a..7eca579be9f 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/ModifyCustomDBEngineVersionResult.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/ModifyCustomDBEngineVersionResult.h
@@ -1324,20 +1324,20 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool GetSupportsIntegrations() const{ return m_supportsIntegrations; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline void SetSupportsIntegrations(bool value) { m_supportsIntegrations = value; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline ModifyCustomDBEngineVersionResult& WithSupportsIntegrations(bool value) { SetSupportsIntegrations(value); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/UpgradeTarget.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/UpgradeTarget.h
index 744b659e6d2..5e5ba1b7fa0 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/UpgradeTarget.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/UpgradeTarget.h
@@ -369,26 +369,26 @@ namespace Model
 
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool GetSupportsIntegrations() const{ return m_supportsIntegrations; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline bool SupportsIntegrationsHasBeenSet() const { return m_supportsIntegrationsHasBeenSet; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline void SetSupportsIntegrations(bool value) { m_supportsIntegrationsHasBeenSet = true; m_supportsIntegrations = value; }
 
     /**
-     * <p>Indicates whether the DB engine version supports Aurora zero-ETL integrations
-     * with Amazon Redshift.</p>
+     * <p>Indicates whether the DB engine version supports zero-ETL integrations with
+     * Amazon Redshift.</p>
      */
     inline UpgradeTarget& WithSupportsIntegrations(bool value) { SetSupportsIntegrations(value); return *this;}
 
diff --git a/generated/tests/controltower-gen-tests/ControlTowerEndpointProviderTests.cpp b/generated/tests/controltower-gen-tests/ControlTowerEndpointProviderTests.cpp
index 667b2ab0ac9..580cad8ea38 100644
--- a/generated/tests/controltower-gen-tests/ControlTowerEndpointProviderTests.cpp
+++ b/generated/tests/controltower-gen-tests/ControlTowerEndpointProviderTests.cpp
@@ -375,6 +375,12 @@ static const Aws::Vector<ControlTowerEndpointProviderEndpointTestCase> TEST_CASE
     {}, // params
     {}, // tags
     {{/*No endpoint expected*/}, /*error*/"Invalid Configuration: Missing Region"} // expect
+  },
+  /*TEST CASE 42*/
+  {"Partition doesn't support DualStack", // documentation
+    {EpParam("UseFIPS", false), EpParam("Region", "us-isob-east-1"), EpParam("UseDualStack", true)}, // params
+    {}, // tags
+    {{/*No endpoint expected*/}, /*error*/"DualStack is enabled but this partition does not support DualStack"} // expect
   }
 };
 
diff --git a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index d377876bc3c..6c36dc8d498 100644
--- a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#define AWS_SDK_VERSION_STRING "1.11.199"
+#define AWS_SDK_VERSION_STRING "1.11.200"
 #define AWS_SDK_VERSION_MAJOR 1
 #define AWS_SDK_VERSION_MINOR 11
-#define AWS_SDK_VERSION_PATCH 199
+#define AWS_SDK_VERSION_PATCH 200
diff --git a/tools/code-generation/api-descriptions/controltower-2018-05-10.normal.json b/tools/code-generation/api-descriptions/controltower-2018-05-10.normal.json
index 74d112a080b..3dd532f97c3 100644
--- a/tools/code-generation/api-descriptions/controltower-2018-05-10.normal.json
+++ b/tools/code-generation/api-descriptions/controltower-2018-05-10.normal.json
@@ -50,7 +50,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>This API call activates a control. It starts an asynchronous operation that creates AWS resources on the specified organizational unit and the accounts it contains. The resources created will vary according to the control that you specify. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a> </p>"
+      "documentation":"<p>This API call activates a control. It starts an asynchronous operation that creates AWS resources on the specified organizational unit and the accounts it contains. The resources created will vary according to the control that you specify. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
     },
     "GetControlOperation":{
       "name":"GetControlOperation",
@@ -68,7 +68,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Returns the status of a particular <code>EnableControl</code> or <code>DisableControl</code> operation. Displays a message in case of error. Details for an operation are available for 90 days. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a> </p>"
+      "documentation":"<p>Returns the status of a particular <code>EnableControl</code> or <code>DisableControl</code> operation. Displays a message in case of error. Details for an operation are available for 90 days. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
     },
     "GetEnabledControl":{
       "name":"GetEnabledControl",
@@ -86,7 +86,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p> Provides details about the enabled control. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p> <p class=\"title\"> <b>Returned values</b> </p> <ul> <li> <p>TargetRegions: Shows target AWS Regions where the enabled control is available to be deployed.</p> </li> <li> <p>StatusSummary: Provides a detailed summary of the deployment status.</p> </li> <li> <p>DriftSummary: Provides a detailed summary of the drifted status.</p> </li> </ul>"
+      "documentation":"<p>Retrieves details about an enabled control. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
     },
     "ListEnabledControls":{
       "name":"ListEnabledControls",
@@ -104,7 +104,55 @@
         {"shape":"ThrottlingException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists the controls enabled by AWS Control Tower on the specified organizational unit and the accounts it contains. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a> </p>"
+      "documentation":"<p>Lists the controls enabled by AWS Control Tower on the specified organizational unit and the accounts it contains. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceInput"},
+      "output":{"shape":"ListTagsForResourceOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns a list of tags associated with the resource. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"TagResourceInput"},
+      "output":{"shape":"TagResourceOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Applies tags to a resource. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"UntagResourceInput"},
+      "output":{"shape":"UntagResourceOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Removes tags from a resource. For usage examples, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\"> <i>the AWS Control Tower User Guide</i> </a>.</p>"
     }
   },
   "shapes":{
@@ -244,6 +292,10 @@
           "shape":"ControlIdentifier",
           "documentation":"<p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b> controls are permitted, with the exception of the <b>Region deny</b> control. For information on how to find the <code>controlIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>.</p>"
         },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Tags to be applied to the <code>EnabledControl</code> resource.</p>"
+        },
         "targetIdentifier":{
           "shape":"TargetIdentifier",
           "documentation":"<p>The ARN of the organizational unit. For information on how to find the <code>targetIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>.</p>"
@@ -254,6 +306,10 @@
       "type":"structure",
       "required":["operationIdentifier"],
       "members":{
+        "arn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the <code>EnabledControl</code> resource.</p>"
+        },
         "operationIdentifier":{
           "shape":"OperationIdentifier",
           "documentation":"<p>The ID of the asynchronous operation, which is used to track status. The operation is available for 90 days.</p>"
@@ -265,56 +321,56 @@
       "members":{
         "arn":{
           "shape":"Arn",
-          "documentation":"<p> The ARN of the enabled control. </p>"
+          "documentation":"<p>The ARN of the enabled control.</p>"
         },
         "controlIdentifier":{
           "shape":"ControlIdentifier",
-          "documentation":"<p> The control identifier of the enabled control. For information on how to find the <code>controlIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>. </p>"
+          "documentation":"<p>The control identifier of the enabled control. For information on how to find the <code>controlIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>.</p>"
         },
         "driftStatusSummary":{
           "shape":"DriftStatusSummary",
-          "documentation":"<p> The drift status of the enabled control. </p>"
+          "documentation":"<p>The drift status of the enabled control.</p>"
         },
         "statusSummary":{
           "shape":"EnablementStatusSummary",
-          "documentation":"<p> The deployment summary of the enabled control. </p>"
+          "documentation":"<p>The deployment summary of the enabled control.</p>"
         },
         "targetIdentifier":{
           "shape":"TargetIdentifier",
-          "documentation":"<p> The ARN of the organizational unit. For information on how to find the <code>targetIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>. </p>"
+          "documentation":"<p>The ARN of the organizational unit. For information on how to find the <code>targetIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>.</p>"
         },
         "targetRegions":{
           "shape":"TargetRegions",
-          "documentation":"<p> Target AWS Regions for the enabled control. </p>"
+          "documentation":"<p>Target AWS Regions for the enabled control.</p>"
         }
       },
-      "documentation":"<p> Information about the enabled control. </p>"
+      "documentation":"<p>Information about the enabled control.</p>"
     },
     "EnabledControlSummary":{
       "type":"structure",
       "members":{
         "arn":{
           "shape":"Arn",
-          "documentation":"<p> The ARN of the enabled control. </p>"
+          "documentation":"<p>The ARN of the enabled control.</p>"
         },
         "controlIdentifier":{
           "shape":"ControlIdentifier",
-          "documentation":"<p>The ARN of the control. Only <b>Strongly recommended</b> and <b>Elective</b> controls are permitted, with the exception of the <b>Region deny</b> control. For information on how to find the <code>controlIdentifier</code>, see <a href=\"https://docs.aws.amazon.com/controltower/latest/APIReference/Welcome.html\">the overview page</a>.</p>"
+          "documentation":"<p>The <code>controlIdentifier</code> of the enabled control.</p>"
         },
         "driftStatusSummary":{
           "shape":"DriftStatusSummary",
-          "documentation":"<p> The drift status of the enabled control. </p>"
+          "documentation":"<p>The drift status of the enabled control.</p>"
         },
         "statusSummary":{
           "shape":"EnablementStatusSummary",
-          "documentation":"<zonbook></zonbook><xhtml></xhtml>"
+          "documentation":"<p>A short description of the status of the enabled control.</p>"
         },
         "targetIdentifier":{
           "shape":"TargetIdentifier",
           "documentation":"<p> The ARN of the organizational unit. </p>"
         }
       },
-      "documentation":"<p>A summary of enabled controls.</p>"
+      "documentation":"<p>Returns a summary of information about an enabled control.</p>"
     },
     "EnabledControls":{
       "type":"list",
@@ -333,14 +389,14 @@
       "members":{
         "lastOperationIdentifier":{
           "shape":"OperationIdentifier",
-          "documentation":"<p> The last operation identifier for the enabled control. </p>"
+          "documentation":"<p>The last operation identifier for the enabled control.</p>"
         },
         "status":{
           "shape":"EnablementStatus",
           "documentation":"<p> The deployment status of the enabled control.</p> <p>Valid values:</p> <ul> <li> <p> <code>SUCCEEDED</code>: The <code>enabledControl</code> configuration was deployed successfully.</p> </li> <li> <p> <code>UNDER_CHANGE</code>: The <code>enabledControl</code> configuration is changing. </p> </li> <li> <p> <code>FAILED</code>: The <code>enabledControl</code> configuration failed to deploy.</p> </li> </ul>"
         }
       },
-      "documentation":"<p> The deployment summary of the enabled control. </p>"
+      "documentation":"<p>The deployment summary of the enabled control.</p>"
     },
     "GetControlOperationInput":{
       "type":"structure",
@@ -368,7 +424,7 @@
       "members":{
         "enabledControlIdentifier":{
           "shape":"Arn",
-          "documentation":"<p> The ARN of the enabled control. </p>"
+          "documentation":"<p>The <code>controlIdentifier</code> of the enabled control.</p>"
         }
       }
     },
@@ -378,7 +434,7 @@
       "members":{
         "enabledControlDetails":{
           "shape":"EnabledControlDetails",
-          "documentation":"<p> Information about the enabled control. </p>"
+          "documentation":"<p>Information about the enabled control.</p>"
         }
       }
     },
@@ -430,6 +486,28 @@
         }
       }
     },
+    "ListTagsForResourceInput":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"Arn",
+          "documentation":"<p> The ARN of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceOutput":{
+      "type":"structure",
+      "required":["tags"],
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A list of tags, as <code>key:value</code> strings.</p>"
+        }
+      }
+    },
     "MaxResults":{
       "type":"integer",
       "box":true,
@@ -447,7 +525,7 @@
       "members":{
         "name":{
           "shape":"RegionName",
-          "documentation":"<p> The AWS Region name. </p>"
+          "documentation":"<p>The AWS Region name.</p>"
         }
       },
       "documentation":"<p>An AWS Region in which AWS Control Tower expects to find the control deployed. </p> <p>The expected Regions are based on the Regions that are governed by the landing zone. In certain cases, a control is not actually enabled in the Region as expected, such as during drift, or <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/region-how.html#mixed-governance\">mixed governance</a>.</p>"
@@ -488,6 +566,53 @@
       "type":"timestamp",
       "timestampFormat":"iso8601"
     },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceInput":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the resource to be tagged.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Tags to be applied to the resource.</p>"
+        }
+      }
+    },
+    "TagResourceOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
     "TargetIdentifier":{
       "type":"string",
       "max":2048,
@@ -526,6 +651,32 @@
       "exception":true,
       "retryable":{"throttling":true}
     },
+    "UntagResourceInput":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>Tag keys to be removed from the resource.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "ValidationException":{
       "type":"structure",
       "required":["message"],
@@ -540,5 +691,5 @@
       "exception":true
     }
   },
-  "documentation":"<p>These interfaces allow you to apply the AWS library of pre-defined <i>controls</i> to your organizational units, programmatically. In AWS Control Tower, the terms \"control\" and \"guardrail\" are synonyms. .</p> <p>To call these APIs, you'll need to know:</p> <ul> <li> <p>the <code>controlIdentifier</code> for the control--or guardrail--you are targeting.</p> </li> <li> <p>the ARN associated with the target organizational unit (OU), which we call the <code>targetIdentifier</code>.</p> </li> </ul> <p> <b>To get the <code>controlIdentifier</code> for your AWS Control Tower control:</b> </p> <p>The <code>controlIdentifier</code> is an ARN that is specified for each control. You can view the <code>controlIdentifier</code> in the console on the <b>Control details</b> page, as well as in the documentation.</p> <p>The <code>controlIdentifier</code> is unique in each AWS Region for each control. You can find the <code>controlIdentifier</code> for each Region and control in the <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-metadata-tables.html\">Tables of control metadata</a> in the <i>AWS Control Tower User Guide.</i> </p> <p>A quick-reference list of control identifers for the AWS Control Tower legacy <i>Strongly recommended</i> and <i>Elective</i> controls is given in <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html.html\">Resource identifiers for APIs and guardrails</a> in the <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html\">Controls reference guide section</a> of the <i>AWS Control Tower User Guide</i>. Remember that <i>Mandatory</i> controls cannot be added or removed.</p> <note> <p> <b>ARN format:</b> <code>arn:aws:controltower:{REGION}::control/{CONTROL_NAME}</code> </p> <p> <b>Example:</b> </p> <p> <code>arn:aws:controltower:us-west-2::control/AWS-GR_AUTOSCALING_LAUNCH_CONFIG_PUBLIC_IP_DISABLED</code> </p> </note> <p> <b>To get the <code>targetIdentifier</code>:</b> </p> <p>The <code>targetIdentifier</code> is the ARN for an OU.</p> <p>In the AWS Organizations console, you can find the ARN for the OU on the <b>Organizational unit details</b> page associated with that OU.</p> <note> <p> <b>OU ARN format:</b> </p> <p> <code>arn:${Partition}:organizations::${MasterAccountId}:ou/o-${OrganizationId}/ou-${OrganizationalUnitId}</code> </p> </note> <p class=\"title\"> <b>Details and examples</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\">Control API input and output examples with CLI</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/enable-controls.html\">Enable controls with CloudFormation</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-metadata-tables.html\">Control metadata tables</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html\">List of identifiers for legacy controls</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/controls.html\">Controls reference guide</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/controls-reference.html\">Controls library groupings</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/creating-resources-with-cloudformation.html\">Creating AWS Control Tower resources with AWS CloudFormation</a> </p> </li> </ul> <p>To view the open source resource repository on GitHub, see <a href=\"https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-controltower\">aws-cloudformation/aws-cloudformation-resource-providers-controltower</a> </p> <p> <b>Recording API Requests</b> </p> <p>AWS Control Tower supports AWS CloudTrail, a service that records AWS API calls for your AWS account and delivers log files to an Amazon S3 bucket. By using information collected by CloudTrail, you can determine which requests the AWS Control Tower service received, who made the request and when, and so on. For more about AWS Control Tower and its support for CloudTrail, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/logging-using-cloudtrail.html\">Logging AWS Control Tower Actions with AWS CloudTrail</a> in the AWS Control Tower User Guide. To learn more about CloudTrail, including how to turn it on and find your log files, see the AWS CloudTrail User Guide.</p>"
+  "documentation":"<p>These interfaces allow you to apply the AWS library of pre-defined <i>controls</i> to your organizational units, programmatically. In AWS Control Tower, the terms \"control\" and \"guardrail\" are synonyms.</p> <p>To call these APIs, you'll need to know:</p> <ul> <li> <p>the <code>controlIdentifier</code> for the control--or guardrail--you are targeting.</p> </li> <li> <p>the ARN associated with the target organizational unit (OU), which we call the <code>targetIdentifier</code>.</p> </li> <li> <p>the ARN associated with a resource that you wish to tag or untag.</p> </li> </ul> <p> <b>To get the <code>controlIdentifier</code> for your AWS Control Tower control:</b> </p> <p>The <code>controlIdentifier</code> is an ARN that is specified for each control. You can view the <code>controlIdentifier</code> in the console on the <b>Control details</b> page, as well as in the documentation.</p> <p>The <code>controlIdentifier</code> is unique in each AWS Region for each control. You can find the <code>controlIdentifier</code> for each Region and control in the <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-metadata-tables.html\">Tables of control metadata</a> in the <i>AWS Control Tower User Guide.</i> </p> <p>A quick-reference list of control identifers for the AWS Control Tower legacy <i>Strongly recommended</i> and <i>Elective</i> controls is given in <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html.html\">Resource identifiers for APIs and controls</a> in the <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html\">Controls reference guide section</a> of the <i>AWS Control Tower User Guide</i>. Remember that <i>Mandatory</i> controls cannot be added or removed.</p> <note> <p> <b>ARN format:</b> <code>arn:aws:controltower:{REGION}::control/{CONTROL_NAME}</code> </p> <p> <b>Example:</b> </p> <p> <code>arn:aws:controltower:us-west-2::control/AWS-GR_AUTOSCALING_LAUNCH_CONFIG_PUBLIC_IP_DISABLED</code> </p> </note> <p> <b>To get the <code>targetIdentifier</code>:</b> </p> <p>The <code>targetIdentifier</code> is the ARN for an OU.</p> <p>In the AWS Organizations console, you can find the ARN for the OU on the <b>Organizational unit details</b> page associated with that OU.</p> <note> <p> <b>OU ARN format:</b> </p> <p> <code>arn:${Partition}:organizations::${MasterAccountId}:ou/o-${OrganizationId}/ou-${OrganizationalUnitId}</code> </p> </note> <p class=\"title\"> <b>Details and examples</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-api-examples-short.html\">Control API input and output examples with CLI</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/enable-controls.html\">Enable controls with CloudFormation</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-metadata-tables.html\">Control metadata tables</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/control-identifiers.html\">List of identifiers for legacy controls</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/controls.html\">Controls reference guide</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/controls-reference.html\">Controls library groupings</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/creating-resources-with-cloudformation.html\">Creating AWS Control Tower resources with AWS CloudFormation</a> </p> </li> </ul> <p>To view the open source resource repository on GitHub, see <a href=\"https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-controltower\">aws-cloudformation/aws-cloudformation-resource-providers-controltower</a> </p> <p> <b>Recording API Requests</b> </p> <p>AWS Control Tower supports AWS CloudTrail, a service that records AWS API calls for your AWS account and delivers log files to an Amazon S3 bucket. By using information collected by CloudTrail, you can determine which requests the AWS Control Tower service received, who made the request and when, and so on. For more about AWS Control Tower and its support for CloudTrail, see <a href=\"https://docs.aws.amazon.com/controltower/latest/userguide/logging-using-cloudtrail.html\">Logging AWS Control Tower Actions with AWS CloudTrail</a> in the AWS Control Tower User Guide. To learn more about CloudTrail, including how to turn it on and find your log files, see the AWS CloudTrail User Guide.</p>"
 }
diff --git a/tools/code-generation/api-descriptions/cur-2017-01-06.normal.json b/tools/code-generation/api-descriptions/cur-2017-01-06.normal.json
index 33a8b741beb..36235badd30 100644
--- a/tools/code-generation/api-descriptions/cur-2017-01-06.normal.json
+++ b/tools/code-generation/api-descriptions/cur-2017-01-06.normal.json
@@ -25,7 +25,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Deletes the specified report.</p>"
+      "documentation":"<p>Deletes the specified report. Any tags associated with the report are also deleted.</p>"
     },
     "DescribeReportDefinitions":{
       "name":"DescribeReportDefinitions",
@@ -38,7 +38,22 @@
       "errors":[
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Lists the AWS Cost and Usage reports available to this account.</p>"
+      "documentation":"<p>Lists the Amazon Web Services Cost and Usage Report available to this account.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Lists the tags associated with the specified report definition.</p>"
     },
     "ModifyReportDefinition":{
       "name":"ModifyReportDefinition",
@@ -52,7 +67,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Allows you to programatically update your report preferences.</p>"
+      "documentation":"<p>Allows you to programmatically update your report preferences.</p>"
     },
     "PutReportDefinition":{
       "name":"PutReportDefinition",
@@ -66,15 +81,46 @@
         {"shape":"DuplicateReportNameException"},
         {"shape":"ReportLimitReachedException"},
         {"shape":"InternalErrorException"},
-        {"shape":"ValidationException"}
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Creates a new report using the description that you provide.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Associates a set of tags with a report definition.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Disassociates a set of tags from a report definition.</p>"
     }
   },
   "shapes":{
     "AWSRegion":{
       "type":"string",
-      "documentation":"<p>The region of the S3 bucket that AWS delivers the report into.</p>",
+      "documentation":"<p>The region of the S3 bucket that Amazon Web Services delivers the report into.</p>",
       "enum":[
         "af-south-1",
         "ap-east-1",
@@ -108,7 +154,7 @@
     },
     "AdditionalArtifact":{
       "type":"string",
-      "documentation":"<p>The types of manifest that you want AWS to create for this report.</p>",
+      "documentation":"<p>The types of manifest that you want Amazon Web Services to create for this report.</p>",
       "enum":[
         "REDSHIFT",
         "QUICKSIGHT",
@@ -127,7 +173,7 @@
     },
     "CompressionFormat":{
       "type":"string",
-      "documentation":"<p>The compression format that AWS uses for the report.</p>",
+      "documentation":"<p>The compression format that Amazon Web Services uses for the report.</p>",
       "enum":[
         "ZIP",
         "GZIP",
@@ -136,6 +182,7 @@
     },
     "DeleteReportDefinitionRequest":{
       "type":"structure",
+      "required":["ReportName"],
       "members":{
         "ReportName":{
           "shape":"ReportName",
@@ -161,14 +208,14 @@
         "MaxResults":{"shape":"MaxResults"},
         "NextToken":{"shape":"GenericString"}
       },
-      "documentation":"<p>Requests a list of AWS Cost and Usage reports owned by the account.</p>"
+      "documentation":"<p>Requests a Amazon Web Services Cost and Usage Report list owned by the account.</p>"
     },
     "DescribeReportDefinitionsResponse":{
       "type":"structure",
       "members":{
         "ReportDefinitions":{
           "shape":"ReportDefinitionList",
-          "documentation":"<p>A list of AWS Cost and Usage reports owned by the account.</p>"
+          "documentation":"<p>An Amazon Web Services Cost and Usage Report list owned by the account.</p>"
         },
         "NextToken":{"shape":"GenericString"}
       },
@@ -201,9 +248,42 @@
       "exception":true,
       "fault":true
     },
+    "LastDelivery":{
+      "type":"string",
+      "max":20,
+      "min":16,
+      "pattern":"[0-9]{8}[T][0-9]{6}([Z]|[+-][0-9]{4})"
+    },
+    "LastStatus":{
+      "type":"string",
+      "enum":[
+        "SUCCESS",
+        "ERROR_PERMISSIONS",
+        "ERROR_NO_BUCKET"
+      ]
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ReportName"],
+      "members":{
+        "ReportName":{
+          "shape":"ReportName",
+          "documentation":"<p>The report name of the report definition that tags are to be returned for.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the report definition resource.</p>"
+        }
+      }
+    },
     "MaxResults":{
       "type":"integer",
-      "documentation":"<p>The maximum number of results that AWS returns for the operation.</p>",
+      "documentation":"<p>The maximum number of results that Amazon Web Services returns for the operation.</p>",
       "box":true,
       "max":5,
       "min":5
@@ -231,6 +311,10 @@
         "ReportDefinition":{
           "shape":"ReportDefinition",
           "documentation":"<p>Represents the output of the PutReportDefinition operation. The content consists of the detailed metadata and data file information. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to be assigned to the report definition resource.</p>"
         }
       },
       "documentation":"<p>Creates a Cost and Usage Report.</p>"
@@ -283,10 +367,14 @@
         },
         "BillingViewArn":{
           "shape":"BillingViewArn",
-          "documentation":"<p> The Amazon resource name of the billing view. You can get this value by using the billing view service public APIs. </p>"
+          "documentation":"<p> The Amazon resource name of the billing view. The <code>BillingViewArn</code> is needed to create Amazon Web Services Cost and Usage Report for each billing group maintained in the Amazon Web Services Billing Conductor service. The <code>BillingViewArn</code> for a billing group can be constructed as: <code>arn:aws:billing::payer-account-id:billingview/billing-group-primary-account-id</code> </p>"
+        },
+        "ReportStatus":{
+          "shape":"ReportStatus",
+          "documentation":"<p>The status of the report.</p>"
         }
       },
-      "documentation":"<p>The definition of AWS Cost and Usage Report. You can specify the report name, time unit, report format, compression format, S3 bucket, additional artifacts, and schema elements in the definition. </p>"
+      "documentation":"<p>The definition of Amazon Web Services Cost and Usage Report. You can specify the report name, time unit, report format, compression format, S3 bucket, additional artifacts, and schema elements in the definition. </p>"
     },
     "ReportDefinitionList":{
       "type":"list",
@@ -295,7 +383,7 @@
     },
     "ReportFormat":{
       "type":"string",
-      "documentation":"<p>The format that AWS saves the report in.</p>",
+      "documentation":"<p>The format that Amazon Web Services saves the report in.</p>",
       "enum":[
         "textORcsv",
         "Parquet"
@@ -315,6 +403,20 @@
       "max":256,
       "pattern":"[0-9A-Za-z!\\-_.*\\'()]+"
     },
+    "ReportStatus":{
+      "type":"structure",
+      "members":{
+        "lastDelivery":{
+          "shape":"LastDelivery",
+          "documentation":"<p>A timestamp that gives the date of a report delivery.</p>"
+        },
+        "lastStatus":{
+          "shape":"LastStatus",
+          "documentation":"<p>An enum that gives the status of a report delivery.</p>"
+        }
+      },
+      "documentation":"<p>A two element dictionary with a <code>lastDelivery</code> and <code>lastStatus</code> key whose values describe the date and status of the last delivered report for a particular report definition.</p>"
+    },
     "ReportVersioning":{
       "type":"string",
       "enum":[
@@ -322,24 +424,33 @@
         "OVERWRITE_REPORT"
       ]
     },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified report (<code>ReportName</code>) in the request doesn't exist.</p>",
+      "exception":true
+    },
     "S3Bucket":{
       "type":"string",
-      "documentation":"<p>The S3 bucket where AWS delivers the report.</p>",
+      "documentation":"<p>The S3 bucket where Amazon Web Services delivers the report.</p>",
       "max":256,
       "pattern":"[A-Za-z0-9_\\.\\-]+"
     },
     "S3Prefix":{
       "type":"string",
-      "documentation":"<p>The prefix that AWS adds to the report name when AWS delivers the report. Your prefix can't include spaces.</p>",
+      "documentation":"<p>The prefix that Amazon Web Services adds to the report name when Amazon Web Services delivers the report. Your prefix can't include spaces.</p>",
       "max":256,
       "pattern":"[0-9A-Za-z!\\-_.*\\'()/]*"
     },
     "SchemaElement":{
       "type":"string",
-      "documentation":"<p>Whether or not AWS includes resource IDs in the report. </p>",
+      "documentation":"<p>Whether or not Amazon Web Services includes resource IDs in the report. </p>",
       "enum":[
         "RESOURCES",
-        "SPLIT_COST_ALLOCATION_DATA"
+        "SPLIT_COST_ALLOCATION_DATA",
+        "MANUAL_DISCOUNT_COMPATIBILITY"
       ]
     },
     "SchemaElementList":{
@@ -347,6 +458,70 @@
       "member":{"shape":"SchemaElement"},
       "documentation":"<p>A list of strings that indicate the content that is included in the report, such as service or usage type.</p>"
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>The key of the tag. Tag keys are case sensitive. Each report definition can only have up to one tag with the same key. If you try to add an existing tag with the same key, the existing tag value will be updated to the new value.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The value of the tag. Tag values are case-sensitive. This can be an empty string.</p>"
+        }
+      },
+      "documentation":"<p>Describes a tag. A tag is a key-value pair. You can add up to 50 tags to a report definition.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ReportName",
+        "Tags"
+      ],
+      "members":{
+        "ReportName":{
+          "shape":"ReportName",
+          "documentation":"<p>The report name of the report definition that tags are to be associated with.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to be assigned to the report definition resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":".*"
+    },
     "TimeUnit":{
       "type":"string",
       "documentation":"<p>The length of time covered by the report. </p>",
@@ -356,14 +531,36 @@
         "MONTHLY"
       ]
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ReportName",
+        "TagKeys"
+      ],
+      "members":{
+        "ReportName":{
+          "shape":"ReportName",
+          "documentation":"<p>The report name of the report definition that tags are to be disassociated from.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tags to be disassociated from the report definition resource.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "ValidationException":{
       "type":"structure",
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>The input fails to satisfy the constraints specified by an AWS service.</p>",
+      "documentation":"<p>The input fails to satisfy the constraints specified by an Amazon Web Services service.</p>",
       "exception":true
     }
   },
-  "documentation":"<p>The AWS Cost and Usage Report API enables you to programmatically create, query, and delete AWS Cost and Usage report definitions.</p> <p>AWS Cost and Usage reports track the monthly AWS costs and usage associated with your AWS account. The report contains line items for each unique combination of AWS product, usage type, and operation that your AWS account uses. You can configure the AWS Cost and Usage report to show only the data that you want, using the AWS Cost and Usage API.</p> <p>Service Endpoint</p> <p>The AWS Cost and Usage Report API provides the following endpoint:</p> <ul> <li> <p>cur.us-east-1.amazonaws.com</p> </li> </ul>"
+  "documentation":"<p>You can use the Amazon Web Services Cost and Usage Report API to programmatically create, query, and delete Amazon Web Services Cost and Usage Report definitions.</p> <p>Amazon Web Services Cost and Usage Report track the monthly Amazon Web Services costs and usage associated with your Amazon Web Services account. The report contains line items for each unique combination of Amazon Web Services product, usage type, and operation that your Amazon Web Services account uses. You can configure the Amazon Web Services Cost and Usage Report to show only the data that you want, using the Amazon Web Services Cost and Usage Report API.</p> <p>Service Endpoint</p> <p>The Amazon Web Services Cost and Usage Report API provides the following endpoint:</p> <ul> <li> <p>cur.us-east-1.amazonaws.com</p> </li> </ul>"
 }
diff --git a/tools/code-generation/api-descriptions/ec2-2016-11-15.normal.json b/tools/code-generation/api-descriptions/ec2-2016-11-15.normal.json
index 45944b3700b..72160beaaf8 100644
--- a/tools/code-generation/api-descriptions/ec2-2016-11-15.normal.json
+++ b/tools/code-generation/api-descriptions/ec2-2016-11-15.normal.json
@@ -8614,16 +8614,16 @@
       "members":{
         "EnaSrdEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether ENA Express is enabled for the network interface that's attached to the instance.</p>",
+          "documentation":"<p>Indicates whether ENA Express is enabled for the network interface.</p>",
           "locationName":"enaSrdEnabled"
         },
         "EnaSrdUdpSpecification":{
           "shape":"AttachmentEnaSrdUdpSpecification",
-          "documentation":"<p>ENA Express configuration for UDP network traffic.</p>",
+          "documentation":"<p>Configures ENA Express for UDP network traffic.</p>",
           "locationName":"enaSrdUdpSpecification"
         }
       },
-      "documentation":"<p>Describes the ENA Express configuration for the network interface that's attached to the instance.</p>"
+      "documentation":"<p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.</p> <p>To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.</p>"
     },
     "AttachmentEnaSrdUdpSpecification":{
       "type":"structure",
@@ -8634,7 +8634,7 @@
           "locationName":"enaSrdUdpEnabled"
         }
       },
-      "documentation":"<p>Describes the ENA Express configuration for UDP traffic on the network interface that's attached to the instance.</p>"
+      "documentation":"<p>ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.</p>"
     },
     "AttachmentStatus":{
       "type":"string",
@@ -20632,7 +20632,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>boot-mode</code> - The boot mode that was specified by the AMI (<code>legacy-bios</code> | <code>uefi</code> | <code>uefi-preferred</code>).</p> </li> <li> <p> <code>capacity-reservation-id</code> - The ID of the Capacity Reservation into which the instance was launched.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-preference</code> - The instance's Capacity Reservation preference (<code>open</code> | <code>none</code>).</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-id</code> - The ID of the targeted Capacity Reservation.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-resource-group-arn</code> - The ARN of the targeted Capacity Reservation group.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>current-instance-boot-mode</code> - The boot mode that is used to launch the instance at launch or start (<code>legacy-bios</code> | <code>uefi</code>).</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>ebs-optimized</code> - A Boolean that indicates whether the instance is optimized for Amazon EBS I/O.</p> </li> <li> <p> <code>ena-support</code> - A Boolean that indicates whether the instance is enabled for enhanced networking with ENA.</p> </li> <li> <p> <code>enclave-options.enabled</code> - A Boolean that indicates whether the instance is enabled for Amazon Web Services Nitro Enclaves.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation.</p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>). The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>iam-instance-profile.id</code> - The instance profile associated with the instance. Specified as an ID.</p> </li> <li> <p> <code>iam-instance-profile.name</code> - The instance profile associated with the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>ipv6-address</code> - The IPv6 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, <code>2021-09-29T11:04:43.305Z</code>. You can use a wildcard (<code>*</code>), for example, <code>2021-09-29T*</code>, which matches an entire day.</p> </li> <li> <p> <code>maintenance-options.auto-recovery</code> - The current automatic recovery behavior of the instance (<code>disabled</code> | <code>default</code>).</p> </li> <li> <p> <code>metadata-options.http-endpoint</code> - The status of access to the HTTP metadata endpoint on your instance (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv4</code> - Indicates whether the IPv4 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv6</code> - Indicates whether the IPv6 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-put-response-hop-limit</code> - The HTTP metadata request put response hop limit (integer, possible values <code>1</code> to <code>64</code>)</p> </li> <li> <p> <code>metadata-options.http-tokens</code> - The metadata request authorization state (<code>optional</code> | <code>required</code>)</p> </li> <li> <p> <code>metadata-options.instance-metadata-tags</code> - The status of access to instance tags from the instance metadata (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.state</code> - The state of the metadata option changes (<code>pending</code> | <code>applied</code>).</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.association.allocation-id</code> - The allocation ID.</p> </li> <li> <p> <code>network-interface.addresses.association.association-id</code> - The association ID.</p> </li> <li> <p> <code>network-interface.addresses.association.carrier-ip</code> - The carrier IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.private-dns-name</code> - The private DNS name.</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.association.carrier-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.network-card-index</code> - The index of the network card.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.deny-all-igw-traffic</code> - A Boolean that indicates whether a network interface with an IPv6 address is unreachable from the public internet.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv4-prefixes.ipv4-prefix</code> - The IPv4 prefixes that are assigned to the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.is-primary-ipv6</code> - A Boolean that indicates whether this is the primary IPv6 address.</p> </li> <li> <p> <code>network-interface.ipv6-native</code> - A Boolean that indicates whether this is an IPv6 only network interface.</p> </li> <li> <p> <code>network-interface.ipv6-prefixes.ipv6-prefix</code> - The IPv6 prefix assigned to the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.outpost-arn</code> - The ARN of the Outpost.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.private-ip-address</code> - The private IPv4 address.</p> </li> <li> <p> <code>network-interface.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by Amazon Web Services.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.tag-key</code> - The key of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.tag-value</code> - The value of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>outpost-arn</code> - The Amazon Resource Name (ARN) of the Outpost.</p> </li> <li> <p> <code>owner-id</code> - The Amazon Web Services account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>platform-details</code> - The platform (<code>Linux/UNIX</code> | <code>Red Hat BYOL Linux</code> | <code> Red Hat Enterprise Linux</code> | <code>Red Hat Enterprise Linux with HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard</code> | <code>Red Hat Enterprise Linux with SQL Server Web</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise</code> | <code>SQL Server Enterprise</code> | <code>SQL Server Standard</code> | <code>SQL Server Web</code> | <code>SUSE Linux</code> | <code>Ubuntu Pro</code> | <code>Windows</code> | <code>Windows BYOL</code> | <code>Windows with SQL Server Enterprise</code> | <code>Windows with SQL Server Standard</code> | <code>Windows with SQL Server Web</code>).</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-a-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS A records.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-aaaa-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.</p> </li> <li> <p> <code>private-dns-name-options.hostname-type</code> - The type of hostname (<code>ip-name</code> | <code>resource-name</code>).</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, Amazon Web Services Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag:&lt;key&gt;</code> - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>tpm-support</code> - Indicates if the instance is configured for NitroTPM support (<code>v2.0</code>). </p> </li> <li> <p> <code>usage-operation</code> - The usage operation value for the instance (<code>RunInstances</code> | <code>RunInstances:00g0</code> | <code>RunInstances:0010</code> | <code>RunInstances:1010</code> | <code>RunInstances:1014</code> | <code>RunInstances:1110</code> | <code>RunInstances:0014</code> | <code>RunInstances:0210</code> | <code>RunInstances:0110</code> | <code>RunInstances:0100</code> | <code>RunInstances:0004</code> | <code>RunInstances:0200</code> | <code>RunInstances:000g</code> | <code>RunInstances:0g00</code> | <code>RunInstances:0002</code> | <code>RunInstances:0800</code> | <code>RunInstances:0102</code> | <code>RunInstances:0006</code> | <code>RunInstances:0202</code>).</p> </li> <li> <p> <code>usage-operation-update-time</code> - The time that the usage operation was last updated, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>boot-mode</code> - The boot mode that was specified by the AMI (<code>legacy-bios</code> | <code>uefi</code> | <code>uefi-preferred</code>).</p> </li> <li> <p> <code>capacity-reservation-id</code> - The ID of the Capacity Reservation into which the instance was launched.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-preference</code> - The instance's Capacity Reservation preference (<code>open</code> | <code>none</code>).</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-id</code> - The ID of the targeted Capacity Reservation.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-resource-group-arn</code> - The ARN of the targeted Capacity Reservation group.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>current-instance-boot-mode</code> - The boot mode that is used to launch the instance at launch or start (<code>legacy-bios</code> | <code>uefi</code>).</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>ebs-optimized</code> - A Boolean that indicates whether the instance is optimized for Amazon EBS I/O.</p> </li> <li> <p> <code>ena-support</code> - A Boolean that indicates whether the instance is enabled for enhanced networking with ENA.</p> </li> <li> <p> <code>enclave-options.enabled</code> - A Boolean that indicates whether the instance is enabled for Amazon Web Services Nitro Enclaves.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation.</p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>). The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>iam-instance-profile.id</code> - The instance profile associated with the instance. Specified as an ID.</p> </li> <li> <p> <code>iam-instance-profile.name</code> - The instance profile associated with the instance. Specified as an name.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a Scheduled Instance, or a Capacity Block (<code>spot</code> | <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>ipv6-address</code> - The IPv6 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, <code>2021-09-29T11:04:43.305Z</code>. You can use a wildcard (<code>*</code>), for example, <code>2021-09-29T*</code>, which matches an entire day.</p> </li> <li> <p> <code>maintenance-options.auto-recovery</code> - The current automatic recovery behavior of the instance (<code>disabled</code> | <code>default</code>).</p> </li> <li> <p> <code>metadata-options.http-endpoint</code> - The status of access to the HTTP metadata endpoint on your instance (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv4</code> - Indicates whether the IPv4 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv6</code> - Indicates whether the IPv6 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-put-response-hop-limit</code> - The HTTP metadata request put response hop limit (integer, possible values <code>1</code> to <code>64</code>)</p> </li> <li> <p> <code>metadata-options.http-tokens</code> - The metadata request authorization state (<code>optional</code> | <code>required</code>)</p> </li> <li> <p> <code>metadata-options.instance-metadata-tags</code> - The status of access to instance tags from the instance metadata (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.state</code> - The state of the metadata option changes (<code>pending</code> | <code>applied</code>).</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.association.allocation-id</code> - The allocation ID.</p> </li> <li> <p> <code>network-interface.addresses.association.association-id</code> - The association ID.</p> </li> <li> <p> <code>network-interface.addresses.association.carrier-ip</code> - The carrier IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.private-dns-name</code> - The private DNS name.</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.association.carrier-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.network-card-index</code> - The index of the network card.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.deny-all-igw-traffic</code> - A Boolean that indicates whether a network interface with an IPv6 address is unreachable from the public internet.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv4-prefixes.ipv4-prefix</code> - The IPv4 prefixes that are assigned to the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.is-primary-ipv6</code> - A Boolean that indicates whether this is the primary IPv6 address.</p> </li> <li> <p> <code>network-interface.ipv6-native</code> - A Boolean that indicates whether this is an IPv6 only network interface.</p> </li> <li> <p> <code>network-interface.ipv6-prefixes.ipv6-prefix</code> - The IPv6 prefix assigned to the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.outpost-arn</code> - The ARN of the Outpost.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.private-ip-address</code> - The private IPv4 address.</p> </li> <li> <p> <code>network-interface.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by Amazon Web Services.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.tag-key</code> - The key of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.tag-value</code> - The value of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>outpost-arn</code> - The Amazon Resource Name (ARN) of the Outpost.</p> </li> <li> <p> <code>owner-id</code> - The Amazon Web Services account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>platform-details</code> - The platform (<code>Linux/UNIX</code> | <code>Red Hat BYOL Linux</code> | <code> Red Hat Enterprise Linux</code> | <code>Red Hat Enterprise Linux with HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard</code> | <code>Red Hat Enterprise Linux with SQL Server Web</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise</code> | <code>SQL Server Enterprise</code> | <code>SQL Server Standard</code> | <code>SQL Server Web</code> | <code>SUSE Linux</code> | <code>Ubuntu Pro</code> | <code>Windows</code> | <code>Windows BYOL</code> | <code>Windows with SQL Server Enterprise</code> | <code>Windows with SQL Server Standard</code> | <code>Windows with SQL Server Web</code>).</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-a-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS A records.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-aaaa-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.</p> </li> <li> <p> <code>private-dns-name-options.hostname-type</code> - The type of hostname (<code>ip-name</code> | <code>resource-name</code>).</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, Amazon Web Services Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag:&lt;key&gt;</code> - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>tpm-support</code> - Indicates if the instance is configured for NitroTPM support (<code>v2.0</code>). </p> </li> <li> <p> <code>usage-operation</code> - The usage operation value for the instance (<code>RunInstances</code> | <code>RunInstances:00g0</code> | <code>RunInstances:0010</code> | <code>RunInstances:1010</code> | <code>RunInstances:1014</code> | <code>RunInstances:1110</code> | <code>RunInstances:0014</code> | <code>RunInstances:0210</code> | <code>RunInstances:0110</code> | <code>RunInstances:0100</code> | <code>RunInstances:0004</code> | <code>RunInstances:0200</code> | <code>RunInstances:000g</code> | <code>RunInstances:0g00</code> | <code>RunInstances:0002</code> | <code>RunInstances:0800</code> | <code>RunInstances:0102</code> | <code>RunInstances:0006</code> | <code>RunInstances:0202</code>).</p> </li> <li> <p> <code>usage-operation-update-time</code> - The time that the usage operation was last updated, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "InstanceIds":{
@@ -26865,16 +26865,40 @@
       },
       "documentation":"<p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.</p> <p>To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.</p>"
     },
+    "EnaSrdSpecificationRequest":{
+      "type":"structure",
+      "members":{
+        "EnaSrdEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether ENA Express is enabled for the network interface when you launch an instance from your launch template.</p>"
+        },
+        "EnaSrdUdpSpecification":{
+          "shape":"EnaSrdUdpSpecificationRequest",
+          "documentation":"<p>Contains ENA Express settings for UDP network traffic in your launch template.</p>"
+        }
+      },
+      "documentation":"<p>Launch instances with ENA Express settings configured from your launch template.</p>"
+    },
     "EnaSrdSupported":{"type":"boolean"},
     "EnaSrdUdpSpecification":{
       "type":"structure",
       "members":{
         "EnaSrdUdpEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether UDP traffic uses ENA Express. To specify this setting, you must first enable ENA Express.</p>"
+          "documentation":"<p>Indicates whether UDP traffic to and from the instance uses ENA Express. To specify this setting, you must first enable ENA Express.</p>"
         }
       },
-      "documentation":"<p>ENA Express is compatible with both TCP and UDP transport protocols. When it’s enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.</p>"
+      "documentation":"<p>ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.</p>"
+    },
+    "EnaSrdUdpSpecificationRequest":{
+      "type":"structure",
+      "members":{
+        "EnaSrdUdpEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether UDP traffic uses ENA Express for your instance. To ensure that UDP traffic can use ENA Express when you launch an instance, you must also set <b>EnaSrdEnabled</b> in the <b>EnaSrdSpecificationRequest</b> to <code>true</code> in your launch template.</p>"
+        }
+      },
+      "documentation":"<p>Configures ENA Express for UDP network traffic from your launch template.</p>"
     },
     "EnaSupport":{
       "type":"string",
@@ -33522,6 +33546,33 @@
       },
       "documentation":"<p>Describes an instance.</p>"
     },
+    "InstanceAttachmentEnaSrdSpecification":{
+      "type":"structure",
+      "members":{
+        "EnaSrdEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether ENA Express is enabled for the network interface.</p>",
+          "locationName":"enaSrdEnabled"
+        },
+        "EnaSrdUdpSpecification":{
+          "shape":"InstanceAttachmentEnaSrdUdpSpecification",
+          "documentation":"<p>Configures ENA Express for UDP network traffic.</p>",
+          "locationName":"enaSrdUdpSpecification"
+        }
+      },
+      "documentation":"<p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.</p> <p>To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.</p>"
+    },
+    "InstanceAttachmentEnaSrdUdpSpecification":{
+      "type":"structure",
+      "members":{
+        "EnaSrdUdpEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether UDP traffic to and from the instance uses ENA Express. To specify this setting, you must first enable ENA Express.</p>",
+          "locationName":"enaSrdUdpEnabled"
+        }
+      },
+      "documentation":"<p>ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.</p>"
+    },
     "InstanceAttribute":{
       "type":"structure",
       "members":{
@@ -34515,6 +34566,11 @@
           "shape":"Integer",
           "documentation":"<p>The index of the network card.</p>",
           "locationName":"networkCardIndex"
+        },
+        "EnaSrdSpecification":{
+          "shape":"InstanceAttachmentEnaSrdSpecification",
+          "documentation":"<p>Contains the ENA Express settings for the network interface that's attached to the instance.</p>",
+          "locationName":"enaSrdSpecification"
         }
       },
       "documentation":"<p>Describes a network interface attachment.</p>"
@@ -34624,6 +34680,10 @@
         "PrimaryIpv6":{
           "shape":"Boolean",
           "documentation":"<p>The primary IPv6 address of the network interface. When you enable an IPv6 GUA address to be a primary IPv6, the first IPv6 GUA will be made the primary IPv6 address until the instance is terminated or the network interface is detached. For more information about primary IPv6 addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>.</p>"
+        },
+        "EnaSrdSpecification":{
+          "shape":"EnaSrdSpecificationRequest",
+          "documentation":"<p>Specifies the ENA Express settings for the network interface that's attached to the instance.</p>"
         }
       },
       "documentation":"<p>Describes a network interface.</p>"
@@ -38310,6 +38370,33 @@
         "locationName":"item"
       }
     },
+    "LaunchTemplateEnaSrdSpecification":{
+      "type":"structure",
+      "members":{
+        "EnaSrdEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether ENA Express is enabled for the network interface.</p>",
+          "locationName":"enaSrdEnabled"
+        },
+        "EnaSrdUdpSpecification":{
+          "shape":"LaunchTemplateEnaSrdUdpSpecification",
+          "documentation":"<p>Configures ENA Express for UDP network traffic.</p>",
+          "locationName":"enaSrdUdpSpecification"
+        }
+      },
+      "documentation":"<p>ENA Express uses Amazon Web Services Scalable Reliable Datagram (SRD) technology to increase the maximum bandwidth used per stream and minimize tail latency of network traffic between EC2 instances. With ENA Express, you can communicate between two EC2 instances in the same subnet within the same account, or in different accounts. Both sending and receiving instances must have ENA Express enabled.</p> <p>To improve the reliability of network packet delivery, ENA Express reorders network packets on the receiving end by default. However, some UDP-based applications are designed to handle network packets that are out of order to reduce the overhead for packet delivery at the network layer. When ENA Express is enabled, you can specify whether UDP network traffic uses it.</p>"
+    },
+    "LaunchTemplateEnaSrdUdpSpecification":{
+      "type":"structure",
+      "members":{
+        "EnaSrdUdpEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether UDP traffic to and from the instance uses ENA Express. To specify this setting, you must first enable ENA Express.</p>",
+          "locationName":"enaSrdUdpEnabled"
+        }
+      },
+      "documentation":"<p>ENA Express is compatible with both TCP and UDP transport protocols. When it's enabled, TCP traffic automatically uses it. However, some UDP-based applications are designed to handle network packets that are out of order, without a need for retransmission, such as live video broadcasting or other near-real-time applications. For UDP traffic, you can specify whether to use ENA Express, based on your application environment needs.</p>"
+    },
     "LaunchTemplateEnclaveOptions":{
       "type":"structure",
       "members":{
@@ -38651,6 +38738,11 @@
           "shape":"Boolean",
           "documentation":"<p>The primary IPv6 address of the network interface. When you enable an IPv6 GUA address to be a primary IPv6, the first IPv6 GUA will be made the primary IPv6 address until the instance is terminated or the network interface is detached. For more information about primary IPv6 addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>.</p>",
           "locationName":"primaryIpv6"
+        },
+        "EnaSrdSpecification":{
+          "shape":"LaunchTemplateEnaSrdSpecification",
+          "documentation":"<p>Contains the ENA Express settings for instances launched from your launch template.</p>",
+          "locationName":"enaSrdSpecification"
         }
       },
       "documentation":"<p>Describes a network interface.</p>"
@@ -38747,6 +38839,10 @@
         "PrimaryIpv6":{
           "shape":"Boolean",
           "documentation":"<p>The primary IPv6 address of the network interface. When you enable an IPv6 GUA address to be a primary IPv6, the first IPv6 GUA will be made the primary IPv6 address until the instance is terminated or the network interface is detached. For more information about primary IPv6 addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>.</p>"
+        },
+        "EnaSrdSpecification":{
+          "shape":"EnaSrdSpecificationRequest",
+          "documentation":"<p>Configure ENA Express settings for your launch template.</p>"
         }
       },
       "documentation":"<p>The parameters for a network interface.</p>"
@@ -39096,7 +39192,7 @@
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource to tag.</p> <p>Valid Values lists all resource types for Amazon EC2 that can be tagged. When you create a launch template, you can specify tags for the following resource types only: <code>instance</code> | <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code> | <code>spot-instances-request</code>. If the instance does include the resource type that you specify, the instance launch fails. For example, not all instance types include an Elastic GPU.</p> <p>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</p>"
+          "documentation":"<p>The type of resource to tag.</p> <p>Valid Values lists all resource types for Amazon EC2 that can be tagged. When you create a launch template, you can specify tags for the following resource types only: <code>instance</code> | <code>volume</code> | <code>elastic-gpu</code> | <code>network-interface</code> | <code>spot-instances-request</code>. If the instance does not include the resource type that you specify, the instance launch fails. For example, not all instance types include an Elastic GPU.</p> <p>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -47713,12 +47809,12 @@
         },
         "SecurityGroupIds":{
           "shape":"SecurityGroupIdStringList",
-          "documentation":"<p>One or more security group IDs. You can create a security group using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html\">CreateSecurityGroup</a>. You cannot specify both a security group ID and security name in the same request.</p>",
+          "documentation":"<p>One or more security group IDs. You can create a security group using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html\">CreateSecurityGroup</a>.</p>",
           "locationName":"SecurityGroupId"
         },
         "SecurityGroups":{
           "shape":"SecurityGroupStringList",
-          "documentation":"<p>One or more security group names. For a nondefault VPC, you must use security group IDs instead. You cannot specify both a security group ID and security name in the same request.</p>",
+          "documentation":"<p>One or more security group names. For a nondefault VPC, you must use security group IDs instead.</p>",
           "locationName":"SecurityGroup"
         },
         "InstanceMarketOptions":{
diff --git a/tools/code-generation/api-descriptions/entitlement.marketplace-2017-01-11.normal.json b/tools/code-generation/api-descriptions/entitlement.marketplace-2017-01-11.normal.json
index acdee343058..71aa7036907 100644
--- a/tools/code-generation/api-descriptions/entitlement.marketplace-2017-01-11.normal.json
+++ b/tools/code-generation/api-descriptions/entitlement.marketplace-2017-01-11.normal.json
@@ -121,7 +121,7 @@
           "documentation":"<p>For paginated calls to GetEntitlements, pass the NextToken from the previous GetEntitlementsResult.</p>"
         },
         "MaxResults":{
-          "shape":"Integer",
+          "shape":"PageSizeInteger",
           "documentation":"<p>The maximum number of items to retrieve from the GetEntitlements operation. For pagination, use the NextToken field in subsequent calls to GetEntitlements.</p>"
         }
       },
@@ -163,6 +163,11 @@
       "type":"string",
       "pattern":"\\S+"
     },
+    "PageSizeInteger":{
+      "type":"integer",
+      "max":25,
+      "min":1
+    },
     "ProductCode":{
       "type":"string",
       "max":255,
diff --git a/tools/code-generation/api-descriptions/fms-2018-01-01.normal.json b/tools/code-generation/api-descriptions/fms-2018-01-01.normal.json
index 4dfbe8d02aa..ee7d57c6175 100644
--- a/tools/code-generation/api-descriptions/fms-2018-01-01.normal.json
+++ b/tools/code-generation/api-descriptions/fms-2018-01-01.normal.json
@@ -598,7 +598,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"InvalidTypeException"}
       ],
-      "documentation":"<p>Creates an Firewall Manager policy.</p> <p>Firewall Manager provides the following types of policies: </p> <ul> <li> <p>An WAF policy (type WAFV2), which defines rule groups to run first in the corresponding WAF web ACL and rule groups to run last in the web ACL.</p> </li> <li> <p>An WAF Classic policy (type WAF), which defines a rule group. </p> </li> <li> <p>A Shield Advanced policy, which applies Shield Advanced protection to specified accounts and resources.</p> </li> <li> <p>A security group policy, which manages VPC security groups across your Amazon Web Services organization. </p> </li> <li> <p>An Network Firewall policy, which provides firewall rules to filter network traffic in specified Amazon VPCs.</p> </li> <li> <p>A DNS Firewall policy, which provides Route 53 Resolver DNS Firewall rules to filter DNS queries for specified VPCs.</p> </li> </ul> <p>Each policy is specific to one of the types. If you want to enforce more than one policy type across accounts, create multiple policies. You can create multiple policies for each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield Advanced policy. For more information about subscribing to Shield Advanced, see <a href=\"https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html\">CreateSubscription</a>.</p>"
+      "documentation":"<p>Creates an Firewall Manager policy.</p> <p>A Firewall Manager policy is specific to the individual policy type. If you want to enforce multiple policy types across accounts, you can create multiple policies. You can create more than one policy for each type. </p> <p>If you add a new account to an organization that you created with Organizations, Firewall Manager automatically applies the policy to the resources in that account that are within scope of the policy. </p> <p>Firewall Manager provides the following types of policies: </p> <ul> <li> <p> <b>Shield Advanced policy</b> - This policy applies Shield Advanced protection to specified accounts and resources. </p> </li> <li> <p> <b>Security Groups policy</b> - This type of policy gives you control over security groups that are in use throughout your organization in Organizations and lets you enforce a baseline set of rules across your organization. </p> </li> <li> <p> <b>Network Firewall policy</b> - This policy applies Network Firewall protection to your organization's VPCs. </p> </li> <li> <p> <b>DNS Firewall policy</b> - This policy applies Amazon Route 53 Resolver DNS Firewall protections to your organization's VPCs. </p> </li> <li> <p> <b>Third-party firewall policy</b> - This policy applies third-party firewall protections. Third-party firewalls are available by subscription through the Amazon Web Services Marketplace console at <a href=\"https://aws.amazon.com/marketplace\">Amazon Web Services Marketplace</a>.</p> <ul> <li> <p> <b>Palo Alto Networks Cloud NGFW policy</b> - This policy applies Palo Alto Networks Cloud Next Generation Firewall (NGFW) protections and Palo Alto Networks Cloud NGFW rulestacks to your organization's VPCs.</p> </li> <li> <p> <b>Fortigate CNF policy</b> - This policy applies Fortigate Cloud Native Firewall (CNF) protections. Fortigate CNF is a cloud-centered solution that blocks Zero-Day threats and secures cloud infrastructures with industry-leading advanced threat prevention, smart web application firewalls (WAF), and API protection.</p> </li> </ul> </li> </ul>"
     },
     "PutProtocolsList":{
       "name":"PutProtocolsList",
@@ -1125,7 +1125,7 @@
         },
         "DeleteAllPolicyResources":{
           "shape":"Boolean",
-          "documentation":"<p>If <code>True</code>, the request performs cleanup according to the policy type. </p> <p>For WAF and Shield Advanced policies, the cleanup does the following:</p> <ul> <li> <p>Deletes rule groups created by Firewall Manager</p> </li> <li> <p>Removes web ACLs from in-scope resources</p> </li> <li> <p>Deletes web ACLs that contain no rules or rule groups</p> </li> </ul> <p>For security group policies, the cleanup does the following for each security group in the policy:</p> <ul> <li> <p>Disassociates the security group from in-scope resources </p> </li> <li> <p>Deletes the security group if it was created through Firewall Manager and if it's no longer associated with any resources through another policy</p> </li> </ul> <p>After the cleanup, in-scope resources are no longer protected by web ACLs in this policy. Protection of out-of-scope resources remains unchanged. Scope is determined by tags that you create and accounts that you associate with the policy. When creating the policy, if you specify that only resources in specific accounts or with specific tags are in scope of the policy, those accounts and resources are handled by the policy. All others are out of scope. If you don't specify tags or accounts, all resources are in scope. </p>"
+          "documentation":"<p>If <code>True</code>, the request performs cleanup according to the policy type. </p> <p>For WAF and Shield Advanced policies, the cleanup does the following:</p> <ul> <li> <p>Deletes rule groups created by Firewall Manager</p> </li> <li> <p>Removes web ACLs from in-scope resources</p> </li> <li> <p>Deletes web ACLs that contain no rules or rule groups</p> </li> </ul> <p>For security group policies, the cleanup does the following for each security group in the policy:</p> <ul> <li> <p>Disassociates the security group from in-scope resources </p> </li> <li> <p>Deletes the security group if it was created through Firewall Manager and if it's no longer associated with any resources through another policy</p> </li> </ul> <note> <p>For security group common policies, even if set to <code>False</code>, Firewall Manager deletes all security groups created by Firewall Manager that aren't associated with any other resources through another policy.</p> </note> <p>After the cleanup, in-scope resources are no longer protected by web ACLs in this policy. Protection of out-of-scope resources remains unchanged. Scope is determined by tags that you create and accounts that you associate with the policy. When creating the policy, if you specify that only resources in specific accounts or with specific tags are in scope of the policy, those accounts and resources are handled by the policy. All others are out of scope. If you don't specify tags or accounts, all resources are in scope. </p>"
         }
       }
     },
@@ -1910,7 +1910,7 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The ID of the Firewall Manager policy that you want the details for. This currently only supports security group content audit policies.</p>"
+          "documentation":"<p>The ID of the Firewall Manager policy that you want the details for. You can get violation details for the following policy types:</p> <ul> <li> <p>DNS Firewall</p> </li> <li> <p>Imported Network Firewall</p> </li> <li> <p>Network Firewall</p> </li> <li> <p>Security group content audit</p> </li> <li> <p>Third-party firewall</p> </li> </ul>"
         },
         "MemberAccount":{
           "shape":"AWSAccountId",
@@ -2864,7 +2864,7 @@
         },
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource protected by or in scope of the policy. This is in the format shown in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html\">Amazon Web Services Resource Types Reference</a>. To apply this policy to multiple resource types, specify a resource type of <code>ResourceTypeList</code> and then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>For WAF and Shield Advanced, resource types include <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, <code>AWS::ElasticLoadBalancing::LoadBalancer</code>, <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>. For a security group common policy, valid values are <code>AWS::EC2::NetworkInterface</code> and <code>AWS::EC2::Instance</code>. For a security group content audit policy, valid values are <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>, and <code>AWS::EC2::Instance</code>. For a security group usage audit policy, the value is <code>AWS::EC2::SecurityGroup</code>. For an Network Firewall policy or DNS Firewall policy, the value is <code>AWS::EC2::VPC</code>.</p>"
+          "documentation":"<p>The type of resource protected by or in scope of the policy. This is in the format shown in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html\">Amazon Web Services Resource Types Reference</a>. To apply this policy to multiple resource types, specify a resource type of <code>ResourceTypeList</code> and then specify the resource types in a <code>ResourceTypeList</code>.</p> <p>The following are valid resource types for each Firewall Manager policy type:</p> <ul> <li> <p>Amazon Web Services WAF Classic - <code>AWS::ApiGateway::Stage</code>, <code>AWS::CloudFront::Distribution</code>, and <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>.</p> </li> <li> <p>WAF - <code>AWS::ApiGateway::Stage</code>, <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, and <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p> DNS Firewall, Network Firewall, and third-party firewall - <code>AWS::EC2::VPC</code>.</p> </li> <li> <p>Shield Advanced - <code>AWS::ElasticLoadBalancingV2::LoadBalancer</code>, <code>AWS::ElasticLoadBalancing::LoadBalancer</code>, <code>AWS::EC2::EIP</code>, and <code>AWS::CloudFront::Distribution</code>.</p> </li> <li> <p>Security group content audit - <code>AWS::EC2::SecurityGroup</code>, <code>AWS::EC2::NetworkInterface</code>, and <code>AWS::EC2::Instance</code>.</p> </li> <li> <p>Security group usage audit - <code>AWS::EC2::SecurityGroup</code>.</p> </li> </ul>"
         },
         "ResourceTypeList":{
           "shape":"ResourceTypeList",
@@ -3857,7 +3857,7 @@
         },
         "ManagedServiceData":{
           "shape":"ManagedServiceData",
-          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. </p> <ul> <li> <p>Example: <code>DNS_FIREWALL</code> </p> <p> <code>\"{\\\"type\\\":\\\"DNS_FIREWALL\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-1\\\",\\\"priority\\\":10}],\\\"postProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-2\\\",\\\"priority\\\":9911}]}\"</code> </p> <note> <p>Valid values for <code>preProcessRuleGroups</code> are between 1 and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and 10000.</p> </note> </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code> <code>\"{\\\"type\\\":\\\"IMPORT_NETWORK_FIREWALL\\\",\\\"awsNetworkFirewallConfig\\\":{\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\\/rg1\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:drop\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:pass\\\"],\\\"networkFirewallStatelessCustomActions\\\":[],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\\/ThreatSignaturesEmergingEventsStrictOrder\\\",\\\"priority\\\":8}],\\\"networkFirewallStatefulEngineOptions\\\":{\\\"ruleOrder\\\":\\\"STRICT_ORDER\\\"},\\\"networkFirewallStatefulDefaultActions\\\":[\\\"aws:drop_strict\\\"]}}\"</code> </p> <p> <code>\"{\\\"type\\\":\\\"DNS_FIREWALL\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-1\\\",\\\"priority\\\":10}],\\\"postProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-2\\\",\\\"priority\\\":9911}]}\"</code> </p> <note> <p>Valid values for <code>preProcessRuleGroups</code> are between 1 and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and 10000.</p> </note> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Centralized deployment model</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"awsNetworkFirewallConfig\\\":{\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}},\\\"firewallDeploymentModel\\\":{\\\"centralizedFirewallDeploymentModel\\\":{\\\"centralizedFirewallOrchestrationConfig\\\":{\\\"inspectionVpcIds\\\":[{\\\"resourceId\\\":\\\"vpc-1234\\\",\\\"accountId\\\":\\\"123456789011\\\"}],\\\"firewallCreationConfig\\\":{\\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneId\\\":null,\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]}]}},\\\"allowedIPV4CidrList\\\":[]}}}}\"</code> </p> <p> To use the centralized deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>CENTRALIZED</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with automatic Availability Zone configuration</p> <p> <code> \"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\",\\\"192.168.0.0/28\\\"],\\\"routeManagementAction\\\":\\\"OFF\\\"},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}}\" </code> </p> <p> With automatic Availbility Zone configuration, Firewall Manager chooses which Availability Zones to create the endpoints in. To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with automatic Availability Zone configuration and route management</p> <p> <code> \"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\",\\\"192.168.0.0/28\\\"],\\\"routeManagementAction\\\":\\\"MONITOR\\\",\\\"routeManagementTargetTypes\\\":[\\\"InternetGateway\\\"]},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\": \\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}}\" </code> </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with custom Availability Zone configuration</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"fragmentcustomactionname\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\", \\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}},{\\\"actionName\\\":\\\"fragmentcustomactionname\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"fragmentmetricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"firewallCreationConfig\\\":{ \\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]},{\\\"availabilityZoneName\\\":\\\"us-east-1b\\\",\\\"allowedIPV4CidrList\\\":[ \\\"10.0.0.0/28\\\"]}]} },\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":null,\\\"routeManagementAction\\\":\\\"OFF\\\",\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":boolean}}\" </code> </p> <p> With custom Availability Zone configuration, you define which specific Availability Zones to create endpoints in by configuring <code>firewallCreationConfig</code>. To configure the Availability Zones in <code>firewallCreationConfig</code>, specify either the <code>availabilityZoneName</code> or <code>availabilityZoneId</code> parameter, not both parameters. </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with custom Availability Zone configuration and route management</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"fragmentcustomactionname\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}},{\\\"actionName\\\":\\\"fragmentcustomactionname\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"fragmentmetricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"firewallCreationConfig\\\":{\\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]},{\\\"availabilityZoneName\\\":\\\"us-east-1b\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]}]}},\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":null,\\\"routeManagementAction\\\":\\\"MONITOR\\\",\\\"routeManagementTargetTypes\\\":[\\\"InternetGateway\\\"],\\\"routeManagementConfig\\\":{\\\"allowCrossAZTrafficIfNoEndpoint\\\":true}},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":boolean}}\" </code> </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p> <code>\"{ \"type\":\"THIRD_PARTY_FIREWALL\", \"thirdPartyFirewall\":\"PALO_ALTO_NETWORKS_CLOUD_NGFW\", \"thirdPartyFirewallConfig\":{ \"thirdPartyFirewallPolicyList\":[\"global-1\"] }, \"firewallDeploymentModel\":{ \"distributedFirewallDeploymentModel\":{ \"distributedFirewallOrchestrationConfig\":{ \"firewallCreationConfig\":{ \"endpointLocation\":{ \"availabilityZoneConfigList\":[ { \"availabilityZoneName\":\"${AvailabilityZone}\" } ] } }, \"allowedIPV4CidrList\":[ ] } } } }\"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false, \\\"applyToAllEC2InstanceENIs\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> - Security group tag distribution </p> <p> <code>\"\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\"sg-000e55995d61a06bd\\\"}],\\\"revertManualSecurityGroupChanges\\\":true,\\\"exclusiveResourceSecurityGroupManagement\\\":false,\\\"applyToAllEC2InstanceENIs\\\":false,\\\"includeSharedVPC\\\":false,\\\"enableTagDistribution\\\":true}\"\"</code> </p> <p> Firewall Manager automatically distributes tags from the primary group to the security groups created by this policy. To use security group tag distribution, you must also set <code>revertManualSecurityGroupChanges</code> to <code>true</code>, otherwise Firewall Manager won't be able to create the policy. When you enable <code>revertManualSecurityGroupChanges</code>, Firewall Manager identifies and reports when the security groups created by this policy become non-compliant. </p> <p> Firewall Manager won't distrubute system tags added by Amazon Web Services services into the replica security groups. System tags begin with the <code>aws:</code> prefix. </p> </li> <li> <p>Example: Shared VPCs. Apply the preceding policy to resources in shared VPCs as well as to those in VPCs that the account owns </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false, \\\"applyToAllEC2InstanceENIs\\\":false,\\\"includeSharedVPC\\\":true,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\"sg-000e55995d61a06bd\\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"</code> </p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon CloudFront distributions </p> <p> <code>\"{\\\"type\\\":\\\"SHIELD_ADVANCED\\\",\\\"automaticResponseConfiguration\\\": {\\\"automaticResponseStatus\\\":\\\"ENABLED|IGNORED|DISABLED\\\", \\\"automaticResponseAction\\\":\\\"BLOCK|COUNT\\\"}, \\\"overrideCustomerWebaclClassic\\\":true|false}\"</code> </p> <p>For example: <code>\"{\\\"type\\\":\\\"SHIELD_ADVANCED\\\",\\\"automaticResponseConfiguration\\\": {\\\"automaticResponseStatus\\\":\\\"ENABLED\\\", \\\"automaticResponseAction\\\":\\\"COUNT\\\"}}\"</code> </p> <p>The default value for <code>automaticResponseStatus</code> is <code>IGNORED</code>. The value for <code>automaticResponseAction</code> is only required when <code>automaticResponseStatus</code> is set to <code>ENABLED</code>. The default value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p> <p>For other resource types that you can protect with a Shield Advanced policy, this <code>ManagedServiceData</code> configuration is an empty string.</p> </li> <li> <p>Example: <code>WAFV2</code> - Account takeover prevention and Bot Control managed rule groups, and rule action override </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesATPRuleSet\\\",\\\"managedRuleGroupConfigs\\\":[{\\\"awsmanagedRulesATPRuleSet\\\":{\\\"loginPath\\\":\\\"/loginpath\\\",\\\"requestInspection\\\":{\\\"payloadType\\\":\\\"FORM_ENCODED|JSON\\\",\\\"usernameField\\\":{\\\"identifier\\\":\\\"/form/username\\\"},\\\"passwordField\\\":{\\\"identifier\\\":\\\"/form/password\\\"}}}}]},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true},{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesBotControlRuleSet\\\",\\\"managedRuleGroupConfigs\\\":[{\\\"awsmanagedRulesBotControlRuleSet\\\":{\\\"inspectionLevel\\\":\\\"TARGETED|COMMON\\\"}}]},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true,\\\"ruleActionOverrides\\\":[{\\\"name\\\":\\\"Rule1\\\",\\\"actionToUse\\\":{\\\"allow|block|count|captcha|challenge\\\":{}}},{\\\"name\\\":\\\"Rule2\\\",\\\"actionToUse\\\":{\\\"allow|block|count|captcha|challenge\\\":{}}}]}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\":null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":null,\\\"sampledRequestsEnabledForDefaultActions\\\":true}\"</code> </p> <ul> <li> <p>Fraud Control account takeover prevention (ATP) - For information about the properties available for <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html\">AWSManagedRulesATPRuleSet</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p>Bot Control - For information about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html\">AWSManagedRulesBotControlRuleSet</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule action overrides only for managed rule groups. To configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to override, and <code>ActionToUse</code>, which is the new action to use for the rule. For information about using rule action override, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html\">RuleActionOverride</a> in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example: <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesAdminProtectionRuleSet\\\"},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\":null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":null,\\\"sampledRequestsEnabledForDefaultActions\\\":true,\\\"captchaConfig\\\":{\\\"immunityTimeProperty\\\":{\\\"immunityTime\\\":500}},\\\"challengeConfig\\\":{\\\"immunityTimeProperty\\\":{\\\"immunityTime\\\":800}},\\\"tokenDomains\\\":[\\\"google.com\\\",\\\"amazon.com\\\"]}\"</code> </p> <p>If you update the policy's values for <code>captchaConfig</code>, <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs to contain the new value(s). However, if you don't update the policy's <code>captchaConfig</code>, <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in your local web ACLs will remain unchanged. For information about CAPTCHA and Challenge configs, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html\">CaptchaConfig</a> and <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html\">ChallengeConfig</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p>Example: <code>WAFV2</code> - Firewall Manager support for WAF managed rule group versioning </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":true,\\\"version\\\":\\\"Version_2.0\\\",\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesCommonRuleSet\\\"},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[{\\\"name\\\":\\\"NoUserAgent_HEADER\\\"}]}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[\\\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\\\"],\\\"redactedFields\\\":[{\\\"redactedFieldType\\\":\\\"SingleHeader\\\",\\\"redactedFieldValue\\\":\\\"Cookies\\\"},{\\\"redactedFieldType\\\":\\\"Method\\\"}]}}\"</code> </p> <p> To use a specific version of a WAF managed rule group in your Firewall Manager policy, you must set <code>versionEnabled</code> to <code>true</code>, and set <code>version</code> to the version you'd like to use. If you don't set <code>versionEnabled</code> to <code>true</code>, or if you omit <code>versionEnabled</code>, then Firewall Manager uses the default version of the WAF managed rule group. </p> </li> <li> <p>Example: <code>WAFV2</code> - Logging configurations </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null, \\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\": {\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\", \\\"managedRuleGroupName\\\":\\\"AWSManagedRulesAdminProtectionRuleSet\\\"} ,\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[], \\\"sampledRequestsEnabled\\\":true}],\\\"postProcessRuleGroups\\\":[], \\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\" :null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\" :false,\\\"loggingConfiguration\\\":{\\\"logDestinationConfigs\\\": [\\\"arn:aws:s3:::aws-waf-logs-example-bucket\\\"] ,\\\"redactedFields\\\":[],\\\"loggingFilterConfigs\\\":{\\\"defaultBehavior\\\":\\\"KEEP\\\", \\\"filters\\\":[{\\\"behavior\\\":\\\"KEEP\\\",\\\"requirement\\\":\\\"MEETS_ALL\\\", \\\"conditions\\\":[{\\\"actionCondition\\\":\\\"CAPTCHA\\\"},{\\\"actionCondition\\\": \\\"CHALLENGE\\\"}, {\\\"actionCondition\\\":\\\"EXCLUDED_AS_COUNT\\\"}]}]}},\\\"sampledRequestsEnabledForDefaultActions\\\":true}\"</code> </p> <p>Firewall Manager supports Amazon Kinesis Data Firehose and Amazon S3 as the <code>logDestinationConfigs</code> in your <code>loggingConfiguration</code>. For information about WAF logging configurations, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_LoggingConfiguration.html\">LoggingConfiguration</a> in the <i>WAF API Reference</i> </p> <p>In the <code>loggingConfiguration</code>, you can specify one <code>logDestinationConfigs</code>. Optionally provide as many as 20 <code>redactedFields</code>. The <code>RedactedFieldType</code> must be one of <code>URI</code>, <code>QUERY_STRING</code>, <code>HEADER</code>, or <code>METHOD</code>.</p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p> <code>\"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\":\\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}\"</code> </p> </li> </ul>"
+          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. </p> <ul> <li> <p>Example: <code>DNS_FIREWALL</code> </p> <p> <code>\"{\\\"type\\\":\\\"DNS_FIREWALL\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-1\\\",\\\"priority\\\":10}],\\\"postProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-2\\\",\\\"priority\\\":9911}]}\"</code> </p> <note> <p>Valid values for <code>preProcessRuleGroups</code> are between 1 and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and 10000.</p> </note> </li> <li> <p>Example: <code>IMPORT_NETWORK_FIREWALL</code> </p> <p> <code>\"{\\\"type\\\":\\\"IMPORT_NETWORK_FIREWALL\\\",\\\"awsNetworkFirewallConfig\\\":{\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-west-2:000000000000:stateless-rulegroup\\/rg1\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:drop\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:pass\\\"],\\\"networkFirewallStatelessCustomActions\\\":[],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-west-2:aws-managed:stateful-rulegroup\\/ThreatSignaturesEmergingEventsStrictOrder\\\",\\\"priority\\\":8}],\\\"networkFirewallStatefulEngineOptions\\\":{\\\"ruleOrder\\\":\\\"STRICT_ORDER\\\"},\\\"networkFirewallStatefulDefaultActions\\\":[\\\"aws:drop_strict\\\"]}}\"</code> </p> <p> <code>\"{\\\"type\\\":\\\"DNS_FIREWALL\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-1\\\",\\\"priority\\\":10}],\\\"postProcessRuleGroups\\\":[{\\\"ruleGroupId\\\":\\\"rslvr-frg-2\\\",\\\"priority\\\":9911}]}\"</code> </p> <note> <p>Valid values for <code>preProcessRuleGroups</code> are between 1 and 99. Valid values for <code>postProcessRuleGroups</code> are between 9901 and 10000.</p> </note> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Centralized deployment model</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"awsNetworkFirewallConfig\\\":{\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}},\\\"firewallDeploymentModel\\\":{\\\"centralizedFirewallDeploymentModel\\\":{\\\"centralizedFirewallOrchestrationConfig\\\":{\\\"inspectionVpcIds\\\":[{\\\"resourceId\\\":\\\"vpc-1234\\\",\\\"accountId\\\":\\\"123456789011\\\"}],\\\"firewallCreationConfig\\\":{\\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneId\\\":null,\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]}]}},\\\"allowedIPV4CidrList\\\":[]}}}}\"</code> </p> <p> To use the centralized deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>CENTRALIZED</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with automatic Availability Zone configuration</p> <p> <code> \"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\",\\\"192.168.0.0/28\\\"],\\\"routeManagementAction\\\":\\\"OFF\\\"},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}}\" </code> </p> <p> With automatic Availbility Zone configuration, Firewall Manager chooses which Availability Zones to create the endpoints in. To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with automatic Availability Zone configuration and route management</p> <p> <code> \"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\",\\\"192.168.0.0/28\\\"],\\\"routeManagementAction\\\":\\\"MONITOR\\\",\\\"routeManagementTargetTypes\\\":[\\\"InternetGateway\\\"]},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\": \\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":true}}\" </code> </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with custom Availability Zone configuration</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"fragmentcustomactionname\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\", \\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}},{\\\"actionName\\\":\\\"fragmentcustomactionname\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"fragmentmetricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"firewallCreationConfig\\\":{ \\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]},{\\\"availabilityZoneName\\\":\\\"us-east-1b\\\",\\\"allowedIPV4CidrList\\\":[ \\\"10.0.0.0/28\\\"]}]} },\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":null,\\\"routeManagementAction\\\":\\\"OFF\\\",\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":boolean}}\" </code> </p> <p> With custom Availability Zone configuration, you define which specific Availability Zones to create endpoints in by configuring <code>firewallCreationConfig</code>. To configure the Availability Zones in <code>firewallCreationConfig</code>, specify either the <code>availabilityZoneName</code> or <code>availabilityZoneId</code> parameter, not both parameters. </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>NETWORK_FIREWALL</code> - Distributed deployment model with custom Availability Zone configuration and route management</p> <p> <code>\"{\\\"type\\\":\\\"NETWORK_FIREWALL\\\",\\\"networkFirewallStatelessRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateless-rulegroup/test\\\",\\\"priority\\\":1}],\\\"networkFirewallStatelessDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"customActionName\\\"],\\\"networkFirewallStatelessFragmentDefaultActions\\\":[\\\"aws:forward_to_sfe\\\",\\\"fragmentcustomactionname\\\"],\\\"networkFirewallStatelessCustomActions\\\":[{\\\"actionName\\\":\\\"customActionName\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"metricdimensionvalue\\\"}]}}},{\\\"actionName\\\":\\\"fragmentcustomactionname\\\",\\\"actionDefinition\\\":{\\\"publishMetricAction\\\":{\\\"dimensions\\\":[{\\\"value\\\":\\\"fragmentmetricdimensionvalue\\\"}]}}}],\\\"networkFirewallStatefulRuleGroupReferences\\\":[{\\\"resourceARN\\\":\\\"arn:aws:network-firewall:us-east-1:123456789011:stateful-rulegroup/test\\\"}],\\\"networkFirewallOrchestrationConfig\\\":{\\\"firewallCreationConfig\\\":{\\\"endpointLocation\\\":{\\\"availabilityZoneConfigList\\\":[{\\\"availabilityZoneName\\\":\\\"us-east-1a\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]},{\\\"availabilityZoneName\\\":\\\"us-east-1b\\\",\\\"allowedIPV4CidrList\\\":[\\\"10.0.0.0/28\\\"]}]}},\\\"singleFirewallEndpointPerVPC\\\":false,\\\"allowedIPV4CidrList\\\":null,\\\"routeManagementAction\\\":\\\"MONITOR\\\",\\\"routeManagementTargetTypes\\\":[\\\"InternetGateway\\\"],\\\"routeManagementConfig\\\":{\\\"allowCrossAZTrafficIfNoEndpoint\\\":true}},\\\"networkFirewallLoggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"ALERT\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}},{\\\"logDestinationType\\\":\\\"S3\\\",\\\"logType\\\":\\\"FLOW\\\",\\\"logDestination\\\":{\\\"bucketName\\\":\\\"s3-bucket-name\\\"}}],\\\"overrideExistingConfig\\\":boolean}}\" </code> </p> <p>To use the distributed deployment model, you must set <a href=\"https://docs.aws.amazon.com/fms/2018-01-01/APIReference/API_PolicyOption.html\">PolicyOption</a> to <code>NULL</code>. </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false, \\\"applyToAllEC2InstanceENIs\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> - Security group tag distribution </p> <p> <code>\"\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\"sg-000e55995d61a06bd\\\"}],\\\"revertManualSecurityGroupChanges\\\":true,\\\"exclusiveResourceSecurityGroupManagement\\\":false,\\\"applyToAllEC2InstanceENIs\\\":false,\\\"includeSharedVPC\\\":false,\\\"enableTagDistribution\\\":true}\"\"</code> </p> <p> Firewall Manager automatically distributes tags from the primary group to the security groups created by this policy. To use security group tag distribution, you must also set <code>revertManualSecurityGroupChanges</code> to <code>true</code>, otherwise Firewall Manager won't be able to create the policy. When you enable <code>revertManualSecurityGroupChanges</code>, Firewall Manager identifies and reports when the security groups created by this policy become non-compliant. </p> <p> Firewall Manager won't distrubute system tags added by Amazon Web Services services into the replica security groups. System tags begin with the <code>aws:</code> prefix. </p> </li> <li> <p>Example: Shared VPCs. Apply the preceding policy to resources in shared VPCs as well as to those in VPCs that the account owns </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false, \\\"applyToAllEC2InstanceENIs\\\":false,\\\"includeSharedVPC\\\":true,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\"sg-000e55995d61a06bd\\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"</code> </p> </li> <li> <p>Example: <code>SHIELD_ADVANCED</code> with web ACL management</p> <p> <code>\"{\\\"type\\\":\\\"SHIELD_ADVANCED\\\",\\\"optimizeUnassociatedWebACL\\\":true}\"</code> </p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>, Firewall Manager creates web ACLs in accounts within the policy scope if the web ACLs will be used by at least one resource. Firewall Manager creates web ACLs in the accounts within policy scope only if the web ACLs will be used by at least one resource. If at any time an account comes into policy scope, Firewall Manager automatically creates a web ACL in the account if at least one resource will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a one-time cleanup of unused web ACLs in your account. The cleanup process can take several hours. If a resource leaves policy scope after Firewall Manager creates a web ACL, Firewall Manager doesn't disassociate the resource from the web ACL. If you want Firewall Manager to clean up the web ACL, you must first manually disassociate the resources from the web ACL, and then enable the manage unused web ACLs option in your policy.</p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code>, and Firewall Manager automatically creates an empty web ACL in each account that's within policy scope.</p> </li> <li> <p>Specification for <code>SHIELD_ADVANCED</code> for Amazon CloudFront distributions </p> <p> <code>\"{\\\"type\\\":\\\"SHIELD_ADVANCED\\\",\\\"automaticResponseConfiguration\\\": {\\\"automaticResponseStatus\\\":\\\"ENABLED|IGNORED|DISABLED\\\", \\\"automaticResponseAction\\\":\\\"BLOCK|COUNT\\\"}, \\\"overrideCustomerWebaclClassic\\\":true|false, \\\"optimizeUnassociatedWebACL\\\":true|false}\"</code> </p> <p>For example: <code>\"{\\\"type\\\":\\\"SHIELD_ADVANCED\\\",\\\"automaticResponseConfiguration\\\": {\\\"automaticResponseStatus\\\":\\\"ENABLED\\\", \\\"automaticResponseAction\\\":\\\"COUNT\\\"}}\"</code> </p> <p>The default value for <code>automaticResponseStatus</code> is <code>IGNORED</code>. The value for <code>automaticResponseAction</code> is only required when <code>automaticResponseStatus</code> is set to <code>ENABLED</code>. The default value for <code>overrideCustomerWebaclClassic</code> is <code>false</code>.</p> <p>For other resource types that you can protect with a Shield Advanced policy, this <code>ManagedServiceData</code> configuration is an empty string.</p> </li> <li> <p>Example: <code>THIRD_PARTY_FIREWALL</code> </p> <p>Replace <code>THIRD_PARTY_FIREWALL_NAME</code> with the name of the third-party firewall.</p> <p> <code>\"{ \"type\":\"THIRD_PARTY_FIREWALL\", \"thirdPartyFirewall\":\"THIRD_PARTY_FIREWALL_NAME\", \"thirdPartyFirewallConfig\":{ \"thirdPartyFirewallPolicyList\":[\"global-1\"] }, \"firewallDeploymentModel\":{ \"distributedFirewallDeploymentModel\":{ \"distributedFirewallOrchestrationConfig\":{ \"firewallCreationConfig\":{ \"endpointLocation\":{ \"availabilityZoneConfigList\":[ { \"availabilityZoneName\":\"${AvailabilityZone}\" } ] } }, \"allowedIPV4CidrList\":[ ] } } } }\"</code> </p> </li> <li> <p>Example: <code>WAFV2</code> - Account takeover prevention, Bot Control managed rule groups, optimize unassociated web ACL, and rule action override </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesATPRuleSet\\\",\\\"managedRuleGroupConfigs\\\":[{\\\"awsmanagedRulesATPRuleSet\\\":{\\\"loginPath\\\":\\\"/loginpath\\\",\\\"requestInspection\\\":{\\\"payloadType\\\":\\\"FORM_ENCODED|JSON\\\",\\\"usernameField\\\":{\\\"identifier\\\":\\\"/form/username\\\"},\\\"passwordField\\\":{\\\"identifier\\\":\\\"/form/password\\\"}}}}]},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true},{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesBotControlRuleSet\\\",\\\"managedRuleGroupConfigs\\\":[{\\\"awsmanagedRulesBotControlRuleSet\\\":{\\\"inspectionLevel\\\":\\\"TARGETED|COMMON\\\"}}]},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true,\\\"ruleActionOverrides\\\":[{\\\"name\\\":\\\"Rule1\\\",\\\"actionToUse\\\":{\\\"allow|block|count|captcha|challenge\\\":{}}},{\\\"name\\\":\\\"Rule2\\\",\\\"actionToUse\\\":{\\\"allow|block|count|captcha|challenge\\\":{}}}]}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\":null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":null,\\\"sampledRequestsEnabledForDefaultActions\\\":true,\\\"optimizeUnassociatedWebACL\\\":true}\"</code> </p> <ul> <li> <p>Bot Control - For information about <code>AWSManagedRulesBotControlRuleSet</code> managed rule groups, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesBotControlRuleSet.html\">AWSManagedRulesBotControlRuleSet</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p>Fraud Control account takeover prevention (ATP) - For information about the properties available for <code>AWSManagedRulesATPRuleSet</code> managed rule groups, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_AWSManagedRulesATPRuleSet.html\">AWSManagedRulesATPRuleSet</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p>Optimize unassociated web ACL - If you set <code>optimizeUnassociatedWebACL</code> to <code>true</code>, Firewall Manager creates web ACLs in accounts within the policy scope if the web ACLs will be used by at least one resource. Firewall Manager creates web ACLs in the accounts within policy scope only if the web ACLs will be used by at least one resource. If at any time an account comes into policy scope, Firewall Manager automatically creates a web ACL in the account if at least one resource will use the web ACL.</p> <p>Upon enablement, Firewall Manager performs a one-time cleanup of unused web ACLs in your account. The cleanup process can take several hours. If a resource leaves policy scope after Firewall Manager creates a web ACL, Firewall Manager disassociates the resource from the web ACL, but won't clean up the unused web ACL. Firewall Manager only cleans up unused web ACLs when you first enable management of unused web ACLs in a policy.</p> <p>If you set <code>optimizeUnassociatedWebACL</code> to <code>false</code> Firewall Manager doesn't manage unused web ACLs, and Firewall Manager automatically creates an empty web ACL in each account that's within policy scope.</p> </li> <li> <p>Rule action overrides - Firewall Manager supports rule action overrides only for managed rule groups. To configure a <code>RuleActionOverrides</code> add the <code>Name</code> of the rule to override, and <code>ActionToUse</code>, which is the new action to use for the rule. For information about using rule action override, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_RuleActionOverride.html\">RuleActionOverride</a> in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example: <code>WAFV2</code> - <code>CAPTCHA</code> and <code>Challenge</code> configs </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesAdminProtectionRuleSet\\\"},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[],\\\"sampledRequestsEnabled\\\":true}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\":null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":null,\\\"sampledRequestsEnabledForDefaultActions\\\":true,\\\"captchaConfig\\\":{\\\"immunityTimeProperty\\\":{\\\"immunityTime\\\":500}},\\\"challengeConfig\\\":{\\\"immunityTimeProperty\\\":{\\\"immunityTime\\\":800}},\\\"tokenDomains\\\":[\\\"google.com\\\",\\\"amazon.com\\\"],\\\"associationConfig\\\":{\\\"requestBody\\\":{\\\"CLOUDFRONT\\\":{\\\"defaultSizeInspectionLimit\\\":\\\"KB_16\\\"}}}}\"</code> </p> <ul> <li> <p> <code>CAPTCHA</code> and <code>Challenge</code> configs - If you update the policy's values for <code>associationConfig</code>, <code>captchaConfig</code>, <code>challengeConfig</code>, or <code>tokenDomains</code>, Firewall Manager will overwrite your local web ACLs to contain the new value(s). However, if you don't update the policy's <code>associationConfig</code>, <code>captchaConfig</code>, <code>challengeConfig</code>, or <code>tokenDomains</code> values, the values in your local web ACLs will remain unchanged. For information about association configs, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_AssociationConfig.html\">AssociationConfig</a>. For information about CAPTCHA and Challenge configs, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_CaptchaConfig.html\">CaptchaConfig</a> and <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_ChallengeConfig.html\">ChallengeConfig</a> in the <i>WAF API Reference</i>.</p> </li> <li> <p> <code>defaultSizeInspectionLimit</code> - Specifies the maximum size of the web request body component that an associated Amazon CloudFront distribution should send to WAF for inspection. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_RequestBodyAssociatedResourceTypeConfig.html#WAF-Type-RequestBodyAssociatedResourceTypeConfig-DefaultSizeInspectionLimit\">DefaultSizeInspectionLimit</a> in the <i>WAF API Reference</i>.</p> </li> </ul> </li> <li> <p>Example: <code>WAFV2</code> - Firewall Manager support for WAF managed rule group versioning </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null,\\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\":{\\\"versionEnabled\\\":true,\\\"version\\\":\\\"Version_2.0\\\",\\\"vendorName\\\":\\\"AWS\\\",\\\"managedRuleGroupName\\\":\\\"AWSManagedRulesCommonRuleSet\\\"},\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[{\\\"name\\\":\\\"NoUserAgent_HEADER\\\"}]}],\\\"postProcessRuleGroups\\\":[],\\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"overrideCustomerWebACLAssociation\\\":false,\\\"loggingConfiguration\\\":{\\\"logDestinationConfigs\\\":[\\\"arn:aws:firehose:us-west-2:12345678912:deliverystream/aws-waf-logs-fms-admin-destination\\\"],\\\"redactedFields\\\":[{\\\"redactedFieldType\\\":\\\"SingleHeader\\\",\\\"redactedFieldValue\\\":\\\"Cookies\\\"},{\\\"redactedFieldType\\\":\\\"Method\\\"}]}}\"</code> </p> <p> To use a specific version of a WAF managed rule group in your Firewall Manager policy, you must set <code>versionEnabled</code> to <code>true</code>, and set <code>version</code> to the version you'd like to use. If you don't set <code>versionEnabled</code> to <code>true</code>, or if you omit <code>versionEnabled</code>, then Firewall Manager uses the default version of the WAF managed rule group. </p> </li> <li> <p>Example: <code>WAFV2</code> - Logging configurations </p> <p> <code>\"{\\\"type\\\":\\\"WAFV2\\\",\\\"preProcessRuleGroups\\\":[{\\\"ruleGroupArn\\\":null, \\\"overrideAction\\\":{\\\"type\\\":\\\"NONE\\\"},\\\"managedRuleGroupIdentifier\\\": {\\\"versionEnabled\\\":null,\\\"version\\\":null,\\\"vendorName\\\":\\\"AWS\\\", \\\"managedRuleGroupName\\\":\\\"AWSManagedRulesAdminProtectionRuleSet\\\"} ,\\\"ruleGroupType\\\":\\\"ManagedRuleGroup\\\",\\\"excludeRules\\\":[], \\\"sampledRequestsEnabled\\\":true}],\\\"postProcessRuleGroups\\\":[], \\\"defaultAction\\\":{\\\"type\\\":\\\"ALLOW\\\"},\\\"customRequestHandling\\\" :null,\\\"customResponse\\\":null,\\\"overrideCustomerWebACLAssociation\\\" :false,\\\"loggingConfiguration\\\":{\\\"logDestinationConfigs\\\": [\\\"arn:aws:s3:::aws-waf-logs-example-bucket\\\"] ,\\\"redactedFields\\\":[],\\\"loggingFilterConfigs\\\":{\\\"defaultBehavior\\\":\\\"KEEP\\\", \\\"filters\\\":[{\\\"behavior\\\":\\\"KEEP\\\",\\\"requirement\\\":\\\"MEETS_ALL\\\", \\\"conditions\\\":[{\\\"actionCondition\\\":\\\"CAPTCHA\\\"},{\\\"actionCondition\\\": \\\"CHALLENGE\\\"}, {\\\"actionCondition\\\":\\\"EXCLUDED_AS_COUNT\\\"}]}]}},\\\"sampledRequestsEnabledForDefaultActions\\\":true}\"</code> </p> <p>Firewall Manager supports Amazon Kinesis Data Firehose and Amazon S3 as the <code>logDestinationConfigs</code> in your <code>loggingConfiguration</code>. For information about WAF logging configurations, see <a href=\"https://docs.aws.amazon.com/waf/latest/APIReference/API_LoggingConfiguration.html\">LoggingConfiguration</a> in the <i>WAF API Reference</i> </p> <p>In the <code>loggingConfiguration</code>, you can specify one <code>logDestinationConfigs</code>. Optionally provide as many as 20 <code>redactedFields</code>. The <code>RedactedFieldType</code> must be one of <code>URI</code>, <code>QUERY_STRING</code>, <code>HEADER</code>, or <code>METHOD</code>.</p> </li> <li> <p>Example: <code>WAF Classic</code> </p> <p> <code>\"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\":\\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}\"</code> </p> </li> </ul>"
         },
         "PolicyOption":{
           "shape":"PolicyOption",
diff --git a/tools/code-generation/api-descriptions/mediaconvert-2017-08-29.normal.json b/tools/code-generation/api-descriptions/mediaconvert-2017-08-29.normal.json
index e47e0d9c3d9..ad8347375ad 100644
--- a/tools/code-generation/api-descriptions/mediaconvert-2017-08-29.normal.json
+++ b/tools/code-generation/api-descriptions/mediaconvert-2017-08-29.normal.json
@@ -1502,7 +1502,7 @@
         "SampleRate": {
           "shape": "__integerMin8000Max192000",
           "locationName": "sampleRate",
-          "documentation": "Sample rate in hz."
+          "documentation": "Sample rate in Hz."
         }
       },
       "documentation": "Required when you set Codec to the value AIFF."
@@ -1601,7 +1601,7 @@
     },
     "AudioChannelTag": {
       "type": "string",
-      "documentation": "You can add a tag for this mono-channel audio track to mimic its placement in a multi-channel layout. For example, if this track is the left surround channel, choose Left surround (LS).",
+      "documentation": "Specify the QuickTime audio channel layout tags for the audio channels in this audio track. Enter channel layout tags in the same order as your output's audio channel order. For example, if your output audio track has a left and a right channel, enter Left (L) for the first channel and Right (R) for the second. If your output has multiple single-channel audio tracks, enter a single channel layout tag for each track.",
       "enum": [
         "L",
         "R",
@@ -1639,10 +1639,15 @@
         "ChannelTag": {
           "shape": "AudioChannelTag",
           "locationName": "channelTag",
-          "documentation": "You can add a tag for this mono-channel audio track to mimic its placement in a multi-channel layout. For example, if this track is the left surround channel, choose Left surround (LS)."
+          "documentation": "Specify the QuickTime audio channel layout tags for the audio channels in this audio track. Enter channel layout tags in the same order as your output's audio channel order. For example, if your output audio track has a left and a right channel, enter Left (L) for the first channel and Right (R) for the second. If your output has multiple single-channel audio tracks, enter a single channel layout tag for each track."
+        },
+        "ChannelTags": {
+          "shape": "__listOfAudioChannelTag",
+          "locationName": "channelTags",
+          "documentation": "Specify the QuickTime audio channel layout tags for the audio channels in this audio track. Enter channel layout tags in the same order as your output's audio channel order. For example, if your output audio track has a left and a right channel, enter Left (L) for the first channel and Right (R) for the second. If your output has multiple single-channel audio tracks, enter a single channel layout tag for each track."
         }
       },
-      "documentation": "When you mimic a multi-channel audio layout with multiple mono-channel tracks, you can tag each channel layout manually. For example, you would tag the tracks that contain your left, right, and center audio with Left (L), Right (R), and Center (C), respectively. When you don't specify a value, MediaConvert labels your track as Center (C) by default. To use audio layout tagging, your output must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or AIFF; and you must set up your audio track to have only one channel."
+      "documentation": "Specify the QuickTime audio channel layout tags for the audio channels in this audio track. When you don't specify a value, MediaConvert labels your track as Center (C) by default. To use Audio layout tagging, your output must be in a QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF."
     },
     "AudioCodec": {
       "type": "string",
@@ -1742,7 +1747,7 @@
         "AudioChannelTaggingSettings": {
           "shape": "AudioChannelTaggingSettings",
           "locationName": "audioChannelTaggingSettings",
-          "documentation": "When you mimic a multi-channel audio layout with multiple mono-channel tracks, you can tag each channel layout manually. For example, you would tag the tracks that contain your left, right, and center audio with Left (L), Right (R), and Center (C), respectively. When you don't specify a value, MediaConvert labels your track as Center (C) by default. To use audio layout tagging, your output must be in a QuickTime (.mov) container; your audio codec must be AAC, WAV, or AIFF; and you must set up your audio track to have only one channel."
+          "documentation": "Specify the QuickTime audio channel layout tags for the audio channels in this audio track. When you don't specify a value, MediaConvert labels your track as Center (C) by default. To use Audio layout tagging, your output must be in a QuickTime (MOV) container and your audio codec must be AAC, WAV, or AIFF."
         },
         "AudioNormalizationSettings": {
           "shape": "AudioNormalizationSettings",
@@ -5358,7 +5363,7 @@
     },
     "F4vMoovPlacement": {
       "type": "string",
-      "documentation": "If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of the archive as required for progressive downloading. Otherwise it is placed normally at the end.",
+      "documentation": "To place the MOOV atom at the beginning of your output, which is useful for progressive downloading: Leave blank or choose Progressive download. To place the MOOV at the end of your output: Choose Normal.",
       "enum": [
         "PROGRESSIVE_DOWNLOAD",
         "NORMAL"
@@ -5370,7 +5375,7 @@
         "MoovPlacement": {
           "shape": "F4vMoovPlacement",
           "locationName": "moovPlacement",
-          "documentation": "If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of the archive as required for progressive downloading. Otherwise it is placed normally at the end."
+          "documentation": "To place the MOOV atom at the beginning of your output, which is useful for progressive downloading: Leave blank or choose Progressive download. To place the MOOV at the end of your output: Choose Normal."
         }
       },
       "documentation": "Settings for F4v container"
@@ -5459,7 +5464,7 @@
         "SampleRate": {
           "shape": "__integerMin22050Max48000",
           "locationName": "sampleRate",
-          "documentation": "Sample rate in hz."
+          "documentation": "Sample rate in Hz."
         }
       },
       "documentation": "Required when you set Codec, under AudioDescriptions>CodecSettings, to the value FLAC."
@@ -7984,6 +7989,11 @@
           "locationName": "extendedDataServices",
           "documentation": "If your source content has EIA-608 Line 21 Data Services, enable this feature to specify what MediaConvert does with the Extended Data Services (XDS) packets. You can choose to pass through XDS packets, or remove them from the output. For more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h Content Advisory."
         },
+        "FollowSource": {
+          "shape": "__integerMin1Max150",
+          "locationName": "followSource",
+          "documentation": "Specify the input that MediaConvert references for your default output settings.  MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all  outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs.  If MediaConvert cannot follow your source, for example if you specify an audio-only input,  MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding  to the order of your inputs."
+        },
         "Inputs": {
           "shape": "__listOfInput",
           "locationName": "inputs",
@@ -8145,6 +8155,11 @@
           "locationName": "extendedDataServices",
           "documentation": "If your source content has EIA-608 Line 21 Data Services, enable this feature to specify what MediaConvert does with the Extended Data Services (XDS) packets. You can choose to pass through XDS packets, or remove them from the output. For more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h Content Advisory."
         },
+        "FollowSource": {
+          "shape": "__integerMin1Max150",
+          "locationName": "followSource",
+          "documentation": "Specify the input that MediaConvert references for your default output settings.  MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all  outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs.  If MediaConvert cannot follow your source, for example if you specify an audio-only input,  MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding  to the order of your inputs."
+        },
         "Inputs": {
           "shape": "__listOfInputTemplate",
           "locationName": "inputs",
@@ -9375,7 +9390,7 @@
         "SampleRate": {
           "shape": "__integerMin32000Max48000",
           "locationName": "sampleRate",
-          "documentation": "Sample rate in hz."
+          "documentation": "Sample rate in Hz."
         }
       },
       "documentation": "Required when you set Codec to the value MP2."
@@ -9409,7 +9424,7 @@
         "SampleRate": {
           "shape": "__integerMin22050Max48000",
           "locationName": "sampleRate",
-          "documentation": "Sample rate in hz."
+          "documentation": "Sample rate in Hz."
         },
         "VbrQuality": {
           "shape": "__integerMin0Max9",
@@ -9437,7 +9452,7 @@
     },
     "Mp4MoovPlacement": {
       "type": "string",
-      "documentation": "If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of the archive as required for progressive downloading. Otherwise it is placed normally at the end.",
+      "documentation": "To place the MOOV atom at the beginning of your output, which is useful for progressive downloading: Leave blank or choose Progressive download. To place the MOOV at the end of your output: Choose Normal.",
       "enum": [
         "PROGRESSIVE_DOWNLOAD",
         "NORMAL"
@@ -9469,7 +9484,7 @@
         "MoovPlacement": {
           "shape": "Mp4MoovPlacement",
           "locationName": "moovPlacement",
-          "documentation": "If set to PROGRESSIVE_DOWNLOAD, the MOOV atom is relocated to the beginning of the archive as required for progressive downloading. Otherwise it is placed normally at the end."
+          "documentation": "To place the MOOV atom at the beginning of your output, which is useful for progressive downloading: Leave blank or choose Progressive download. To place the MOOV at the end of your output: Choose Normal."
         },
         "Mp4MajorBrand": {
           "shape": "__string",
@@ -10388,7 +10403,7 @@
         "SampleRate": {
           "shape": "__integerMin16000Max48000",
           "locationName": "sampleRate",
-          "documentation": "Optional. Sample rate in hz. Valid values are 16000, 24000, and 48000. The default value is 48000."
+          "documentation": "Optional. Sample rate in Hz. Valid values are 16000, 24000, and 48000. The default value is 48000."
         }
       },
       "documentation": "Required when you set Codec, under AudioDescriptions>CodecSettings, to the value OPUS."
@@ -11260,10 +11275,13 @@
     },
     "ScalingBehavior": {
       "type": "string",
-      "documentation": "Specify how the service handles outputs that have a different aspect ratio from the input aspect ratio. Choose Stretch to output to have the service stretch your video image to fit. Keep the setting Default to have the service letterbox your video instead. This setting overrides any value that you specify for the setting Selection placement in this output.",
+      "documentation": "Specify the video Scaling behavior when your output has a different resolution than your input. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html",
       "enum": [
         "DEFAULT",
-        "STRETCH_TO_OUTPUT"
+        "STRETCH_TO_OUTPUT",
+        "FIT",
+        "FIT_NO_UPSCALE",
+        "FILL"
       ]
     },
     "SccDestinationFramerate": {
@@ -12074,7 +12092,7 @@
         "ScalingBehavior": {
           "shape": "ScalingBehavior",
           "locationName": "scalingBehavior",
-          "documentation": "Specify how the service handles outputs that have a different aspect ratio from the input aspect ratio. Choose Stretch to output to have the service stretch your video image to fit. Keep the setting Default to have the service letterbox your video instead. This setting overrides any value that you specify for the setting Selection placement in this output."
+          "documentation": "Specify the video Scaling behavior when your output has a different resolution than your input. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/video-scaling.html"
         },
         "Sharpness": {
           "shape": "__integerMin0Max100",
@@ -12134,7 +12152,7 @@
           "documentation": "Enter the start timecode in the underlying input video for this overlay. Your overlay will be active starting with this frame. To display your video overlay starting at the beginning of the underlying video: Leave blank. Use the format HH:MM:SS:FF or HH:MM:SS;FF, where HH is the hour, MM is the minute, SS is the second, and FF is the frame number. When entering this value, take into account your choice for the underlying Input timecode source. For example, if you have embedded timecodes that start at 01:00:00:00 and you want your overlay to begin five minutes into the video, enter 01:05:00:00."
         }
       },
-      "documentation": "Overlay one or more videos on top of your input video."
+      "documentation": "Overlay one or more videos on top of your input video. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/video-overlays.html"
     },
     "VideoOverlayInput": {
       "type": "structure",
@@ -12152,7 +12170,7 @@
         "TimecodeSource": {
           "shape": "InputTimecodeSource",
           "locationName": "timecodeSource",
-          "documentation": "Specify the starting timecode for your video overlay. To use the timecode present in your video overlay: Choose Embedded. To use a zerobased timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When you do, enter the starting timecode in Start timecode. If you don't specify a value for Timecode source, MediaConvert uses Embedded by default."
+          "documentation": "Specify the timecode source for your video overlay input clips. To use the timecode present in your video overlay: Choose Embedded. To use a zerobased timecode: Choose Start at 0. To choose a timecode: Choose Specified start. When you do, enter the starting timecode in Start timecode. If you don't specify a value for Timecode source, MediaConvert uses Embedded by default."
         },
         "TimecodeStart": {
           "shape": "__stringMin11Max11Pattern01D20305D205D",
@@ -13322,6 +13340,11 @@
       "min": 1,
       "max": 1001
     },
+    "__integerMin1Max150": {
+      "type": "integer",
+      "min": 1,
+      "max": 150
+    },
     "__integerMin1Max17895697": {
       "type": "integer",
       "min": 1,
@@ -13583,6 +13606,12 @@
         "shape": "AllowedRenditionSize"
       }
     },
+    "__listOfAudioChannelTag": {
+      "type": "list",
+      "member": {
+        "shape": "AudioChannelTag"
+      }
+    },
     "__listOfAudioDescription": {
       "type": "list",
       "member": {
diff --git a/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json b/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
index 0e8bc27f8e4..5a0790779ad 100644
--- a/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
+++ b/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
@@ -630,7 +630,7 @@
         {"shape":"KMSKeyNotAccessibleFault"},
         {"shape":"IntegrationConflictOperationFault"}
       ],
-      "documentation":"<p>Creates a zero-ETL integration with Amazon Redshift. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html\">Working with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+      "documentation":"<p>Creates a zero-ETL integration with Amazon Redshift.</p>"
     },
     "CreateOptionGroup":{
       "name":"CreateOptionGroup",
@@ -967,7 +967,7 @@
         {"shape":"IntegrationConflictOperationFault"},
         {"shape":"InvalidIntegrationStateFault"}
       ],
-      "documentation":"<p>Deletes a zero-ETL integration with Amazon Redshift. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.deleting.html\">Deleting Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the <i>Amazon Aurora User Guide</i> </p>"
+      "documentation":"<p>Deletes a zero-ETL integration with Amazon Redshift.</p>"
     },
     "DeleteOptionGroup":{
       "name":"DeleteOptionGroup",
@@ -1550,7 +1550,7 @@
       "errors":[
         {"shape":"IntegrationNotFoundFault"}
       ],
-      "documentation":"<p>Describe one or more zero-ETL integration with Amazon Redshift. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.describingmonitoring.html\">Viewing and monitoring Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the <i>Amazon Aurora User Guide</i> </p>"
+      "documentation":"<p>Describe one or more zero-ETL integrations with Amazon Redshift.</p>"
     },
     "DescribeOptionGroupOptions":{
       "name":"DescribeOptionGroupOptions",
@@ -4942,7 +4942,7 @@
       "members":{
         "SourceArn":{
           "shape":"SourceArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Aurora DB cluster to use as the source for replication.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the database to use as the source for replication.</p>"
         },
         "TargetArn":{
           "shape":"Arn",
@@ -4954,7 +4954,7 @@
         },
         "KMSKeyId":{
           "shape":"String",
-          "documentation":"<p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key identifier for the key to use to encrypt the integration. If you don't specify an encryption key, Aurora uses a default Amazon Web Services owned key. </p>"
+          "documentation":"<p>The Amazon Web Services Key Management System (Amazon Web Services KMS) key identifier for the key to use to encrypt the integration. If you don't specify an encryption key, RDS uses a default Amazon Web Services owned key. </p>"
         },
         "AdditionalEncryptionContext":{
           "shape":"EncryptionContextMap",
@@ -6333,7 +6333,7 @@
         },
         "SupportsIntegrations":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether the DB engine version supports Aurora zero-ETL integrations with Amazon Redshift.</p>"
+          "documentation":"<p>Indicates whether the DB engine version supports zero-ETL integrations with Amazon Redshift.</p>"
         }
       },
       "documentation":"<p>This data type is used as a response element in the action <code>DescribeDBEngineVersions</code>.</p>"
@@ -10666,7 +10666,7 @@
       "members":{
         "SourceArn":{
           "shape":"SourceArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Aurora DB cluster used as the source for replication.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the database used as the source for replication.</p>"
         },
         "TargetArn":{
           "shape":"Arn",
@@ -10702,7 +10702,7 @@
           "documentation":"<p>Any errors associated with the integration.</p>"
         }
       },
-      "documentation":"<p>An Aurora zero-ETL integration with Amazon Redshift. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/zero-etl.html\">Working with Amazon Aurora zero-ETL integrations with Amazon Redshift</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+      "documentation":"<p>A zero-ETL integration with Amazon Redshift.</p>"
     },
     "IntegrationAlreadyExistsFault":{
       "type":"structure",
@@ -15768,7 +15768,7 @@
         },
         "SupportsIntegrations":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates whether the DB engine version supports Aurora zero-ETL integrations with Amazon Redshift.</p>"
+          "documentation":"<p>Indicates whether the DB engine version supports zero-ETL integrations with Amazon Redshift.</p>"
         }
       },
       "documentation":"<p>The version of the database engine that a DB instance can be upgraded to.</p>"
diff --git a/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-rule-set.json b/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-rule-set.json
index 88dcbe68ecd..78a42c1832e 100644
--- a/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-tests.json b/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-tests.json
index 592037b78a1..b5e526bdf11 100644
--- a/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-tests.json
+++ b/tools/code-generation/endpoints/controltower-2018-05-10.endpoint-tests.json
@@ -529,6 +529,17 @@
             "expect": {
                 "error": "Invalid Configuration: Missing Region"
             }
+        },
+        {
+            "documentation": "Partition doesn't support DualStack",
+            "expect": {
+                "error": "DualStack is enabled but this partition does not support DualStack"
+            },
+            "params": {
+                "Region": "us-isob-east-1",
+                "UseFIPS": false,
+                "UseDualStack": true
+            }
         }
     ],
     "version": "1.0"
diff --git a/tools/code-generation/endpoints/cur-2017-01-06.endpoint-rule-set.json b/tools/code-generation/endpoints/cur-2017-01-06.endpoint-rule-set.json
index 1b81a458526..77ce4034ffe 100644
--- a/tools/code-generation/endpoints/cur-2017-01-06.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/cur-2017-01-06.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/entitlement.marketplace-2017-01-11.endpoint-rule-set.json b/tools/code-generation/endpoints/entitlement.marketplace-2017-01-11.endpoint-rule-set.json
index 4aa393031f0..e91f63bfb7c 100644
--- a/tools/code-generation/endpoints/entitlement.marketplace-2017-01-11.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/entitlement.marketplace-2017-01-11.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/fms-2018-01-01.endpoint-rule-set.json b/tools/code-generation/endpoints/fms-2018-01-01.endpoint-rule-set.json
index 24da5eb6cec..f768dea6845 100644
--- a/tools/code-generation/endpoints/fms-2018-01-01.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/fms-2018-01-01.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/mediaconvert-2017-08-29.endpoint-rule-set.json b/tools/code-generation/endpoints/mediaconvert-2017-08-29.endpoint-rule-set.json
index b3cfd3d2ad8..52db3f79032 100644
--- a/tools/code-generation/endpoints/mediaconvert-2017-08-29.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/mediaconvert-2017-08-29.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -345,9 +343,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],