diff --git a/codegen/sdk-codegen/aws-models/appsync.json b/codegen/sdk-codegen/aws-models/appsync.json
index 2810fcf07e0..eba63524f88 100644
--- a/codegen/sdk-codegen/aws-models/appsync.json
+++ b/codegen/sdk-codegen/aws-models/appsync.json
@@ -4635,6 +4635,18 @@
                     "traits": {
                         "smithy.api#enumValue": "ALL"
                     }
+                },
+                "INFO": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "INFO"
+                    }
+                },
+                "DEBUG": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "DEBUG"
+                    }
                 }
             }
         },
@@ -7017,7 +7029,7 @@
                 "fieldLogLevel": {
                     "target": "com.amazonaws.appsync#FieldLogLevel",
                     "traits": {
-                        "smithy.api#documentation": "<p>The field logging level. Values can be NONE, ERROR, or ALL.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>NONE</b>: No field-level logs are captured.</p>\n            </li>\n            <li>\n               <p>\n                  <b>ERROR</b>: Logs the following information only for the fields that are\n               in error:</p>\n               <ul>\n                  <li>\n                     <p>The error section in the server response.</p>\n                  </li>\n                  <li>\n                     <p>Field-level errors.</p>\n                  </li>\n                  <li>\n                     <p>The generated request/response functions that got resolved for error fields.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <b>ALL</b>: The following information is logged for all fields in the\n               query:</p>\n               <ul>\n                  <li>\n                     <p>Field-level tracing information.</p>\n                  </li>\n                  <li>\n                     <p>The generated request/response functions that got resolved for each field.</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
+                        "smithy.api#documentation": "<p>The field logging level. Values can be NONE, ERROR, INFO, DEBUG, or ALL.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>NONE</b>: No field-level logs are captured.</p>\n            </li>\n            <li>\n               <p>\n                  <b>ERROR</b>: Logs the following information\n                  <b>only</b> for the fields that are in the error\n               category:</p>\n               <ul>\n                  <li>\n                     <p>The error section in the server response.</p>\n                  </li>\n                  <li>\n                     <p>Field-level errors.</p>\n                  </li>\n                  <li>\n                     <p>The generated request/response functions that got resolved for error fields.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <b>INFO</b>: Logs the following information <b>only</b> for the fields that are in the info and error\n               categories:</p>\n               <ul>\n                  <li>\n                     <p>Info-level messages.</p>\n                  </li>\n                  <li>\n                     <p>The user messages sent through <code>$util.log.info</code> and\n                        <code>console.log</code>.</p>\n                  </li>\n                  <li>\n                     <p>Field-level tracing and mapping logs are not shown.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <b>DEBUG</b>: Logs the following information\n                  <b>only</b> for the fields that are in the debug, info,\n               and error categories:</p>\n               <ul>\n                  <li>\n                     <p>Debug-level messages.</p>\n                  </li>\n                  <li>\n                     <p>The user messages sent through <code>$util.log.info</code>,\n                        <code>$util.log.debug</code>, <code>console.log</code>, and\n                        <code>console.debug</code>.</p>\n                  </li>\n                  <li>\n                     <p>Field-level tracing and mapping logs are not shown.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <b>ALL</b>: The following information is logged for all fields in the\n               query:</p>\n               <ul>\n                  <li>\n                     <p>Field-level tracing information.</p>\n                  </li>\n                  <li>\n                     <p>The generated request/response functions that were resolved for each\n                     field.</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
                         "smithy.api#required": {}
                     }
                 },
diff --git a/codegen/sdk-codegen/aws-models/bedrock-agent.json b/codegen/sdk-codegen/aws-models/bedrock-agent.json
index 9f0bf23c210..9d0f318d38b 100644
--- a/codegen/sdk-codegen/aws-models/bedrock-agent.json
+++ b/codegen/sdk-codegen/aws-models/bedrock-agent.json
@@ -2339,7 +2339,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Creates an agent that orchestrates interactions between foundation models, data sources, software applications, user conversations, and APIs to carry out tasks to help customers.</p>\n         <ul>\n            <li>\n               <p>Specify the following fields for security purposes.</p>\n               <ul>\n                  <li>\n                     <p>\n                        <code>agentResourceRoleArn</code> – The Amazon Resource Name (ARN) of the role with permissions to invoke API operations on an agent.</p>\n                  </li>\n                  <li>\n                     <p>(Optional) <code>customerEncryptionKeyArn</code> – The Amazon Resource Name (ARN) of a KMS key to encrypt the creation of the agent.</p>\n                  </li>\n                  <li>\n                     <p>(Optional) <code>idleSessionTTLinSeconds</code> – Specify the number of seconds for which the agent should maintain session information. After this time expires, the subsequent <code>InvokeAgent</code> request begins a new session.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>To enable your agent to retain conversational context across multiple sessions, include a <code>memoryConfiguration</code> object. \n          For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-configure-memory.html\">Configure memory</a>.</p>\n            </li>\n            <li>\n               <p>To override the default prompt behavior for agent orchestration and to use advanced prompts, include a <code>promptOverrideConfiguration</code> object. \n          For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>.</p>\n            </li>\n            <li>\n               <p>If you agent fails to be created, the response returns a list of <code>failureReasons</code> alongside a list of <code>recommendedActions</code> for you to troubleshoot.</p>\n            </li>\n         </ul>",
+                "smithy.api#documentation": "<p>Creates an agent that orchestrates interactions between foundation models, data sources, software applications, user conversations, and APIs to carry out tasks to help customers.</p>\n         <ul>\n            <li>\n               <p>Specify the following fields for security purposes.</p>\n               <ul>\n                  <li>\n                     <p>\n                        <code>agentResourceRoleArn</code> – The Amazon Resource Name (ARN) of the role with permissions to invoke API operations on an agent.</p>\n                  </li>\n                  <li>\n                     <p>(Optional) <code>customerEncryptionKeyArn</code> – The Amazon Resource Name (ARN) of a KMS key to encrypt the creation of the agent.</p>\n                  </li>\n                  <li>\n                     <p>(Optional) <code>idleSessionTTLinSeconds</code> – Specify the number of seconds for which the agent should maintain session information. After this time expires, the subsequent <code>InvokeAgent</code> request begins a new session.</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>To enable your agent to retain conversational context across multiple sessions, include a <code>memoryConfiguration</code> object. \n          For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-configure-memory.html\">Configure memory</a>.</p>\n            </li>\n            <li>\n               <p>To override the default prompt behavior for agent orchestration and to use advanced prompts, include a <code>promptOverrideConfiguration</code> object. \n          For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>.</p>\n            </li>\n            <li>\n               <p>If your agent fails to be created, the response returns a list of <code>failureReasons</code> alongside a list of <code>recommendedActions</code> for you to troubleshoot.</p>\n            </li>\n            <li>\n               <p>The agent instructions will not be honored if your agent has only one knowledge base, uses default prompts, has no action group, and user input is disabled.</p>\n            </li>\n         </ul>",
                 "smithy.api#http": {
                     "code": 202,
                     "method": "PUT",
@@ -9950,7 +9950,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Settings for parsing document contents. By default, the service converts the contents of each\n    document into text before splitting it into chunks. To improve processing of PDF files with tables and images,\n    you can configure the data source to convert the pages of text into images and use a model to describe the\n    contents of each page.</p>\n         <p>To use a model to parse PDF documents, set the parsing strategy to <code>BEDROCK_FOUNDATION_MODEL</code> and\n    specify the model to use by ARN. You can also override the default parsing prompt with instructions for how\n    to interpret images and tables in your documents. The following models are supported.</p>\n         <ul>\n            <li>\n               <p>Anthropic Claude 3 Sonnet - <code>anthropic.claude-3-sonnet-20240229-v1:0</code>\n               </p>\n            </li>\n            <li>\n               <p>Anthropic Claude 3 Haiku - <code>anthropic.claude-3-haiku-20240307-v1:0</code>\n               </p>\n            </li>\n         </ul>\n         <p>You can get the ARN of a model with the  action. Standard model usage\n    charges apply for the foundation model parsing strategy.</p>"
+                "smithy.api#documentation": "<p>Settings for parsing document contents. By default, the service converts the contents of each\n    document into text before splitting it into chunks. To improve processing of PDF files with tables and images,\n    you can configure the data source to convert the pages of text into images and use a model to describe the\n    contents of each page.</p>\n         <p>To use a model to parse PDF documents, set the parsing strategy to <code>BEDROCK_FOUNDATION_MODEL</code> and\n    specify the model to use by ARN. You can also override the default parsing prompt with instructions for how\n    to interpret images and tables in your documents. The following models are supported.</p>\n         <ul>\n            <li>\n               <p>Anthropic Claude 3 Sonnet - <code>anthropic.claude-3-sonnet-20240229-v1:0</code>\n               </p>\n            </li>\n            <li>\n               <p>Anthropic Claude 3 Haiku - <code>anthropic.claude-3-haiku-20240307-v1:0</code>\n               </p>\n            </li>\n         </ul>\n         <p>You can get the ARN of a model with the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_ListFoundationModels.html\">ListFoundationModels</a> action. Standard model usage\n    charges apply for the foundation model parsing strategy.</p>"
             }
         },
         "com.amazonaws.bedrockagent#ParsingPrompt": {
@@ -10513,6 +10513,63 @@
                 "smithy.api#sensitive": {}
             }
         },
+        "com.amazonaws.bedrockagent#PromptMetadataEntry": {
+            "type": "structure",
+            "members": {
+                "key": {
+                    "target": "com.amazonaws.bedrockagent#PromptMetadataKey",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The key of a metadata tag for a prompt variant.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "value": {
+                    "target": "com.amazonaws.bedrockagent#PromptMetadataValue",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The value of a metadata tag for a prompt variant.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains a key-value pair that defines a metadata tag and value to attach to a prompt variant. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html\">Create a prompt using Prompt management</a>.</p>",
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.bedrockagent#PromptMetadataKey": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 128
+                },
+                "smithy.api#pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$",
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.bedrockagent#PromptMetadataList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.bedrockagent#PromptMetadataEntry"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "max": 50
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.bedrockagent#PromptMetadataValue": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 0,
+                    "max": 1024
+                },
+                "smithy.api#pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$",
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.bedrockagent#PromptModelIdentifier": {
             "type": "string",
             "traits": {
@@ -10794,6 +10851,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>Contains inference configurations for the prompt variant.</p>"
                     }
+                },
+                "metadata": {
+                    "target": "com.amazonaws.bedrockagent#PromptMetadataList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>An array of objects, each containing a key-value pair that defines a metadata tag and value to attach to a prompt variant. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-management-create.html\">Create a prompt using Prompt management</a>.</p>"
+                    }
                 }
             },
             "traits": {
diff --git a/codegen/sdk-codegen/aws-models/cloudwatch-logs.json b/codegen/sdk-codegen/aws-models/cloudwatch-logs.json
index c707644896c..e512433e3a8 100644
--- a/codegen/sdk-codegen/aws-models/cloudwatch-logs.json
+++ b/codegen/sdk-codegen/aws-models/cloudwatch-logs.json
@@ -130,6 +130,21 @@
         "com.amazonaws.cloudwatchlogs#AccountPolicyDocument": {
             "type": "string"
         },
+        "com.amazonaws.cloudwatchlogs#AllowedActionForAllowVendedLogsDeliveryForResource": {
+            "type": "string"
+        },
+        "com.amazonaws.cloudwatchlogs#AllowedFieldDelimiters": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#FieldDelimiter"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#AllowedFields": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#RecordField"
+            }
+        },
         "com.amazonaws.cloudwatchlogs#AmazonResourceName": {
             "type": "string",
             "traits": {
@@ -536,6 +551,106 @@
                 "smithy.api#pattern": "^\\S{36,128}$"
             }
         },
+        "com.amazonaws.cloudwatchlogs#ConfigurationTemplate": {
+            "type": "structure",
+            "members": {
+                "service": {
+                    "target": "com.amazonaws.cloudwatchlogs#Service",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A string specifying which service this configuration template applies to. For more information about supported services see \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html\">Enable logging from Amazon Web Services \n        services.</a>.</p>"
+                    }
+                },
+                "logType": {
+                    "target": "com.amazonaws.cloudwatchlogs#LogType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A string specifying which log type this configuration template applies to.</p>"
+                    }
+                },
+                "resourceType": {
+                    "target": "com.amazonaws.cloudwatchlogs#ResourceType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A string specifying which resource type this configuration template applies to.</p>"
+                    }
+                },
+                "deliveryDestinationType": {
+                    "target": "com.amazonaws.cloudwatchlogs#DeliveryDestinationType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A string specifying which destination type this configuration template applies to.</p>"
+                    }
+                },
+                "defaultDeliveryConfigValues": {
+                    "target": "com.amazonaws.cloudwatchlogs#ConfigurationTemplateDeliveryConfigValues",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A mapping that displays the default value of each property within a delivery’s configuration,\n      if it is not specified in the request.</p>"
+                    }
+                },
+                "allowedFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#AllowedFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The allowed fields that a caller can use in the <code>recordFields</code> parameter of a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a>  or \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_UpdateDeliveryConfiguration.html\">UpdateDeliveryConfiguration</a> operation.</p>"
+                    }
+                },
+                "allowedOutputFormats": {
+                    "target": "com.amazonaws.cloudwatchlogs#OutputFormats",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of delivery destination output formats that are supported by this log source.</p>"
+                    }
+                },
+                "allowedActionForAllowVendedLogsDeliveryForResource": {
+                    "target": "com.amazonaws.cloudwatchlogs#AllowedActionForAllowVendedLogsDeliveryForResource",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The action permissions that a caller needs to have to be able to successfully create a delivery source on the \n      desired resource type when calling <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDeliverySource.html\">PutDeliverySource</a>.</p>"
+                    }
+                },
+                "allowedFieldDelimiters": {
+                    "target": "com.amazonaws.cloudwatchlogs#AllowedFieldDelimiters",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The valid values that a caller can use as field delimiters when calling <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a>  or \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_UpdateDeliveryConfiguration.html\">UpdateDeliveryConfiguration</a>  \n      on a delivery that delivers in <code>Plain</code>, <code>W3C</code>, or <code>Raw</code> format.</p>"
+                    }
+                },
+                "allowedSuffixPathFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#RecordFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of variable fields that can be used in the suffix path of a delivery that delivers to an S3 bucket.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>A structure containing information about the deafult settings and available settings that you can use to configure a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_Delivery.html\">delivery</a> or a \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DeliveryDestination.html\">delivery destination</a>.</p>"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#ConfigurationTemplateDeliveryConfigValues": {
+            "type": "structure",
+            "members": {
+                "recordFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#RecordFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The default record fields that will be delivered when a list of record fields is not provided in \n      a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a> operation.</p>"
+                    }
+                },
+                "fieldDelimiter": {
+                    "target": "com.amazonaws.cloudwatchlogs#FieldDelimiter",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The default field delimiter that is used in a  <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a> operation when\n      the field delimiter is not specified in that operation. The field delimiter is used only when \n      the final output delivery is in <code>Plain</code>, <code>W3C</code>, or <code>Raw</code> format.</p>"
+                    }
+                },
+                "s3DeliveryConfiguration": {
+                    "target": "com.amazonaws.cloudwatchlogs#S3DeliveryConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The delivery parameters that are used when you create a delivery to a delivery destination that is an S3 Bucket.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>This structure contains the default values that are used for each configuration parameter when you use\n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a> to create a deliver under the current service type, resource type, and log type.</p>"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#ConfigurationTemplates": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#ConfigurationTemplate"
+            }
+        },
         "com.amazonaws.cloudwatchlogs#ConflictException": {
             "type": "structure",
             "members": {
@@ -606,6 +721,24 @@
                         "smithy.api#required": {}
                     }
                 },
+                "recordFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#RecordFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of record fields to be delivered to the destination, in order. \n      If the delivery’s log source has mandatory fields, they must be included in this list.</p>"
+                    }
+                },
+                "fieldDelimiter": {
+                    "target": "com.amazonaws.cloudwatchlogs#FieldDelimiter",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The field delimiter to use between record fields when the final output format of a delivery\n      is in <code>Plain</code>, <code>W3C</code>, or <code>Raw</code> format.</p>"
+                    }
+                },
+                "s3DeliveryConfiguration": {
+                    "target": "com.amazonaws.cloudwatchlogs#S3DeliveryConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>This structure contains parameters that are valid only when the delivery’s delivery destination is an S3 bucket.</p>"
+                    }
+                },
                 "tags": {
                     "target": "com.amazonaws.cloudwatchlogs#Tags",
                     "traits": {
@@ -1699,6 +1832,24 @@
                         "smithy.api#documentation": "<p>Displays whether the delivery destination associated with this delivery is CloudWatch Logs, Amazon S3, or Firehose.</p>"
                     }
                 },
+                "recordFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#RecordFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The record fields used in this delivery.</p>"
+                    }
+                },
+                "fieldDelimiter": {
+                    "target": "com.amazonaws.cloudwatchlogs#FieldDelimiter",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The field delimiter that is used between record fields when the final output format of a delivery\n      is in <code>Plain</code>, <code>W3C</code>, or <code>Raw</code> format.</p>"
+                    }
+                },
+                "s3DeliveryConfiguration": {
+                    "target": "com.amazonaws.cloudwatchlogs#S3DeliveryConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>This structure contains delivery configurations that apply only when the delivery destination resource is an S3 bucket.</p>"
+                    }
+                },
                 "tags": {
                     "target": "com.amazonaws.cloudwatchlogs#Tags",
                     "traits": {
@@ -1811,6 +1962,18 @@
                 }
             }
         },
+        "com.amazonaws.cloudwatchlogs#DeliveryDestinationTypes": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#DeliveryDestinationType"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 3
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#DeliveryDestinations": {
             "type": "list",
             "member": {
@@ -1887,6 +2050,15 @@
                 "target": "com.amazonaws.cloudwatchlogs#DeliverySource"
             }
         },
+        "com.amazonaws.cloudwatchlogs#DeliverySuffixPath": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 256
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#Descending": {
             "type": "boolean"
         },
@@ -1957,6 +2129,96 @@
                 "smithy.api#output": {}
             }
         },
+        "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplates": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplatesRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplatesResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ServiceUnavailableException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Use this operation to return the valid and default values that are used when creating delivery sources, delivery destinations, and deliveries.\n      For more information about deliveries, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a>.</p>",
+                "smithy.api#paginated": {
+                    "inputToken": "nextToken",
+                    "outputToken": "nextToken",
+                    "items": "configurationTemplates",
+                    "pageSize": "limit"
+                }
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplatesRequest": {
+            "type": "structure",
+            "members": {
+                "service": {
+                    "target": "com.amazonaws.cloudwatchlogs#Service",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Use this parameter to filter the response to include only the \n      configuration templates that apply to the Amazon Web Services service that you specify here.</p>"
+                    }
+                },
+                "logTypes": {
+                    "target": "com.amazonaws.cloudwatchlogs#LogTypes",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Use this parameter to filter the response to include only the \n      configuration templates that apply to the log types that you specify here.</p>"
+                    }
+                },
+                "resourceTypes": {
+                    "target": "com.amazonaws.cloudwatchlogs#ResourceTypes",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Use this parameter to filter the response to include only the \n      configuration templates that apply to the resource types that you specify here.</p>"
+                    }
+                },
+                "deliveryDestinationTypes": {
+                    "target": "com.amazonaws.cloudwatchlogs#DeliveryDestinationTypes",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Use this parameter to filter the response to include only the \n      configuration templates that apply to the delivery destination types that you specify here.</p>"
+                    }
+                },
+                "nextToken": {
+                    "target": "com.amazonaws.cloudwatchlogs#NextToken"
+                },
+                "limit": {
+                    "target": "com.amazonaws.cloudwatchlogs#DescribeLimit",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Use this parameter to limit the number of configuration templates that are returned\n    in the response.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplatesResponse": {
+            "type": "structure",
+            "members": {
+                "configurationTemplates": {
+                    "target": "com.amazonaws.cloudwatchlogs#ConfigurationTemplates",
+                    "traits": {
+                        "smithy.api#documentation": "<p>An array of objects, where each object describes one configuration template that matches\n    the filters that you specified in the request.</p>"
+                    }
+                },
+                "nextToken": {
+                    "target": "com.amazonaws.cloudwatchlogs#NextToken"
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.cloudwatchlogs#DescribeDeliveries": {
             "type": "operation",
             "input": {
@@ -3063,18 +3325,18 @@
                 "keyAttributes": {
                     "target": "com.amazonaws.cloudwatchlogs#EntityKeyAttributes",
                     "traits": {
-                        "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                        "smithy.api#documentation": "<p>Reserved for internal use.</p>"
                     }
                 },
                 "attributes": {
                     "target": "com.amazonaws.cloudwatchlogs#EntityAttributes",
                     "traits": {
-                        "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                        "smithy.api#documentation": "<p>Reserved for internal use.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                "smithy.api#documentation": "<p>Reserved for internal use.</p>"
             }
         },
         "com.amazonaws.cloudwatchlogs#EntityAttributes": {
@@ -3469,6 +3731,24 @@
         "com.amazonaws.cloudwatchlogs#Field": {
             "type": "string"
         },
+        "com.amazonaws.cloudwatchlogs#FieldDelimiter": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 0,
+                    "max": 5
+                }
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#FieldHeader": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 64
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#FilterCount": {
             "type": "integer"
         },
@@ -5258,6 +5538,18 @@
                 "smithy.api#pattern": "^[\\w]*$"
             }
         },
+        "com.amazonaws.cloudwatchlogs#LogTypes": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#LogType"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 10
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#Logs_20140328": {
             "type": "service",
             "version": "2014-03-28",
@@ -5331,6 +5623,9 @@
                 {
                     "target": "com.amazonaws.cloudwatchlogs#DescribeAccountPolicies"
                 },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#DescribeConfigurationTemplates"
+                },
                 {
                     "target": "com.amazonaws.cloudwatchlogs#DescribeDeliveries"
                 },
@@ -5481,6 +5776,9 @@
                 {
                     "target": "com.amazonaws.cloudwatchlogs#UpdateAnomaly"
                 },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfiguration"
+                },
                 {
                     "target": "com.amazonaws.cloudwatchlogs#UpdateLogAnomalyDetector"
                 }
@@ -6790,6 +7088,12 @@
                 }
             }
         },
+        "com.amazonaws.cloudwatchlogs#OutputFormats": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#OutputFormat"
+            }
+        },
         "com.amazonaws.cloudwatchlogs#OutputLogEvent": {
             "type": "structure",
             "members": {
@@ -7516,7 +7820,7 @@
                 "entity": {
                     "target": "com.amazonaws.cloudwatchlogs#Entity",
                     "traits": {
-                        "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                        "smithy.api#documentation": "<p>Reserved for internal use.</p>"
                     }
                 }
             },
@@ -7542,7 +7846,7 @@
                 "rejectedEntityInfo": {
                     "target": "com.amazonaws.cloudwatchlogs#RejectedEntityInfo",
                     "traits": {
-                        "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                        "smithy.api#documentation": "<p>Reserved for internal use.</p>"
                     }
                 }
             },
@@ -8135,19 +8439,51 @@
                 }
             }
         },
+        "com.amazonaws.cloudwatchlogs#RecordField": {
+            "type": "structure",
+            "members": {
+                "name": {
+                    "target": "com.amazonaws.cloudwatchlogs#FieldHeader",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name to use when specifying this record field in a \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a>  or \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_UpdateDeliveryConfiguration.html\">UpdateDeliveryConfiguration</a> operation. </p>"
+                    }
+                },
+                "mandatory": {
+                    "target": "com.amazonaws.cloudwatchlogs#Boolean",
+                    "traits": {
+                        "smithy.api#documentation": "<p>If this is <code>true</code>, the record field must be present in the <code>recordFields</code> parameter provided to a \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_CreateDelivery.html\">CreateDelivery</a>  or \n      <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_UpdateDeliveryConfiguration.html\">UpdateDeliveryConfiguration</a> operation.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>A structure that represents a valid record field header and whether it is mandatory.</p>"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#RecordFields": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#FieldHeader"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "min": 0,
+                    "max": 128
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#RejectedEntityInfo": {
             "type": "structure",
             "members": {
                 "errorType": {
                     "target": "com.amazonaws.cloudwatchlogs#EntityRejectionErrorType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Reserved for future use.</p>",
+                        "smithy.api#documentation": "<p>Reserved for internal use.</p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Reserved for future use.</p>"
+                "smithy.api#documentation": "<p>Reserved for internal use.</p>"
             }
         },
         "com.amazonaws.cloudwatchlogs#RejectedLogEventsInfo": {
@@ -8257,6 +8593,28 @@
                 "smithy.api#documentation": "<p>A policy enabling one or more entities to put logs to a log group in this account.</p>"
             }
         },
+        "com.amazonaws.cloudwatchlogs#ResourceType": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 255
+                },
+                "smithy.api#pattern": "^[\\w-_]*$"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#ResourceTypes": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.cloudwatchlogs#ResourceType"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 10
+                }
+            }
+        },
         "com.amazonaws.cloudwatchlogs#ResultField": {
             "type": "structure",
             "members": {
@@ -8291,6 +8649,26 @@
                 }
             }
         },
+        "com.amazonaws.cloudwatchlogs#S3DeliveryConfiguration": {
+            "type": "structure",
+            "members": {
+                "suffixPath": {
+                    "target": "com.amazonaws.cloudwatchlogs#DeliverySuffixPath",
+                    "traits": {
+                        "smithy.api#documentation": "<p>This string allows re-configuring the S3 object prefix to contain either static or variable sections. The valid variables \n      to use in the suffix path will vary by each log source. See ConfigurationTemplate$allowedSuffixPathFields for \n      more info on what values are supported in the suffix path for each log source.</p>"
+                    }
+                },
+                "enableHiveCompatiblePath": {
+                    "target": "com.amazonaws.cloudwatchlogs#Boolean",
+                    "traits": {
+                        "smithy.api#documentation": "<p>This parameter causes the S3 objects that contain delivered logs to use a prefix structure that allows for integration with Apache Hive.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>This structure contains delivery configurations that apply only when the delivery destination resource is an S3 bucket.</p>"
+            }
+        },
         "com.amazonaws.cloudwatchlogs#Scope": {
             "type": "enum",
             "members": {
@@ -8346,7 +8724,7 @@
                     "min": 1,
                     "max": 255
                 },
-                "smithy.api#pattern": "^[\\w]*$"
+                "smithy.api#pattern": "^[\\w_-]*$"
             }
         },
         "com.amazonaws.cloudwatchlogs#ServiceQuotaExceededException": {
@@ -9486,6 +9864,78 @@
                 "smithy.api#input": {}
             }
         },
+        "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfiguration": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfigurationRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfigurationResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ConflictException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ServiceUnavailableException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.cloudwatchlogs#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Use this operation to update the configuration of a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_Delivery.html\">delivery</a> to change either the \n      S3 path pattern or the format of the delivered logs. You can't use this operation to change the\n      source or destination of the delivery.</p>"
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfigurationRequest": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.cloudwatchlogs#DeliveryId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The ID of the delivery to be updated by this request.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "recordFields": {
+                    "target": "com.amazonaws.cloudwatchlogs#RecordFields",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of record fields to be delivered to the destination, in order. \n      If the delivery’s log source has mandatory fields, they must be included in this list.</p>"
+                    }
+                },
+                "fieldDelimiter": {
+                    "target": "com.amazonaws.cloudwatchlogs#FieldDelimiter",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The field delimiter to use between record fields when the final output format of a delivery\n      is in <code>Plain</code>, <code>W3C</code>, or <code>Raw</code> format.</p>"
+                    }
+                },
+                "s3DeliveryConfiguration": {
+                    "target": "com.amazonaws.cloudwatchlogs#S3DeliveryConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>This structure contains parameters that are valid only when the delivery’s delivery destination is an S3 bucket.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.cloudwatchlogs#UpdateDeliveryConfigurationResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.cloudwatchlogs#UpdateLogAnomalyDetector": {
             "type": "operation",
             "input": {
diff --git a/codegen/sdk-codegen/aws-models/finspace.json b/codegen/sdk-codegen/aws-models/finspace.json
index b98ff1906f1..14533a31136 100644
--- a/codegen/sdk-codegen/aws-models/finspace.json
+++ b/codegen/sdk-codegen/aws-models/finspace.json
@@ -2337,7 +2337,7 @@
                 "hostType": {
                     "target": "com.amazonaws.finspace#KxHostType",
                     "traits": {
-                        "smithy.api#documentation": "<p>\n   The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>You can add one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>",
+                        "smithy.api#documentation": "<p>\n   The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>You can add one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.large</code> – The host type with a configuration of 16 GiB\n            memory and 2 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.xlarge</code> – The host type with a configuration of 32 GiB\n               memory and 4 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.2xlarge</code> – The host type with a configuration of 64 GiB\n               memory and 8 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>",
                         "smithy.api#required": {}
                     }
                 },
@@ -4899,7 +4899,7 @@
                 "hostType": {
                     "target": "com.amazonaws.finspace#KxHostType",
                     "traits": {
-                        "smithy.api#documentation": "<p>\n      The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>It can have one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>\n      The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>It can have one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.large</code> – The host type with a configuration of 16 GiB\n            memory and 2 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.xlarge</code> – The host type with a configuration of 32 GiB\n               memory and 4 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.2xlarge</code> – The host type with a configuration of 64 GiB\n               memory and 8 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>"
                     }
                 },
                 "clusters": {
@@ -6463,7 +6463,7 @@
                 "hostType": {
                     "target": "com.amazonaws.finspace#KxHostType",
                     "traits": {
-                        "smithy.api#documentation": "<p>\n   The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>You can add one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>\n   The memory and CPU capabilities of the scaling group host on which FinSpace Managed kdb clusters will be placed.</p>\n         <p>You can add one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>kx.sg.large</code> – The host type with a configuration of 16 GiB\n            memory and 2 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.xlarge</code> – The host type with a configuration of 32 GiB\n               memory and 4 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.2xlarge</code> – The host type with a configuration of 64 GiB\n               memory and 8 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.4xlarge</code> – The host type with a configuration of 108 GiB memory and 16 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.8xlarge</code> – The host type with a configuration of 216 GiB memory and 32 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.16xlarge</code> – The host type with a configuration of 432 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg.32xlarge</code> – The host type with a configuration of 864 GiB memory and 128 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.16xlarge</code> – The host type with a configuration of 1949 GiB memory and 64 vCPUs.</p>\n            </li>\n            <li>\n               <p>\n                  <code>kx.sg1.24xlarge</code> – The host type with a configuration of 2948 GiB memory and 96 vCPUs.</p>\n            </li>\n         </ul>"
                     }
                 },
                 "clusters": {
diff --git a/codegen/sdk-codegen/aws-models/fis.json b/codegen/sdk-codegen/aws-models/fis.json
index 472715c049d..ec0e5a5c1f9 100644
--- a/codegen/sdk-codegen/aws-models/fis.json
+++ b/codegen/sdk-codegen/aws-models/fis.json
@@ -1380,6 +1380,12 @@
                     "traits": {
                         "smithy.api#enumValue": "failed"
                     }
+                },
+                "cancelled": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "cancelled"
+                    }
                 }
             }
         },
@@ -2325,6 +2331,9 @@
                 {
                     "target": "com.amazonaws.fis#GetExperimentTemplate"
                 },
+                {
+                    "target": "com.amazonaws.fis#GetSafetyLever"
+                },
                 {
                     "target": "com.amazonaws.fis#GetTargetAccountConfiguration"
                 },
@@ -2370,6 +2379,9 @@
                 {
                     "target": "com.amazonaws.fis#UpdateExperimentTemplate"
                 },
+                {
+                    "target": "com.amazonaws.fis#UpdateSafetyLeverState"
+                },
                 {
                     "target": "com.amazonaws.fis#UpdateTargetAccountConfiguration"
                 }
@@ -3297,6 +3309,58 @@
                 "smithy.api#output": {}
             }
         },
+        "com.amazonaws.fis#GetSafetyLever": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.fis#GetSafetyLeverRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.fis#GetSafetyLeverResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.fis#ResourceNotFoundException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>\n         Gets information about the specified safety lever.\n      </p>",
+                "smithy.api#http": {
+                    "method": "GET",
+                    "uri": "/safetyLevers/{id}",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.fis#GetSafetyLeverRequest": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.fis#SafetyLeverId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n        The ID of the safety lever.\n      </p>",
+                        "smithy.api#httpLabel": {},
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.fis#GetSafetyLeverResponse": {
+            "type": "structure",
+            "members": {
+                "safetyLever": {
+                    "target": "com.amazonaws.fis#SafetyLever",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n      Information about the safety lever.\n      </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.fis#GetTargetAccountConfiguration": {
             "type": "operation",
             "input": {
@@ -4151,6 +4215,105 @@
                 "smithy.api#pattern": "^[\\s\\S]+$"
             }
         },
+        "com.amazonaws.fis#SafetyLever": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.fis#SafetyLeverId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n      The ID of the safety lever.\n      </p>"
+                    }
+                },
+                "arn": {
+                    "target": "com.amazonaws.fis#ResourceArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n     The Amazon Resource Name (ARN) of the safety lever.\n      </p>"
+                    }
+                },
+                "state": {
+                    "target": "com.amazonaws.fis#SafetyLeverState",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n        The state of the safety lever.\n      </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>\n        Describes a safety lever.\n      </p>"
+            }
+        },
+        "com.amazonaws.fis#SafetyLeverId": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 0,
+                    "max": 64
+                },
+                "smithy.api#pattern": "^[\\S]+$"
+            }
+        },
+        "com.amazonaws.fis#SafetyLeverState": {
+            "type": "structure",
+            "members": {
+                "status": {
+                    "target": "com.amazonaws.fis#SafetyLeverStatus",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n         The state of the safety lever.\n      </p>"
+                    }
+                },
+                "reason": {
+                    "target": "com.amazonaws.fis#SafetyLeverStatusReason",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n       The reason for the state of the safety lever.\n      </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>\n        Describes the state of the safety lever.\n      </p>"
+            }
+        },
+        "com.amazonaws.fis#SafetyLeverStatus": {
+            "type": "enum",
+            "members": {
+                "DISENGAGED": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "disengaged"
+                    }
+                },
+                "ENGAGED": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "engaged"
+                    }
+                },
+                "ENGAGING": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "engaging"
+                    }
+                }
+            }
+        },
+        "com.amazonaws.fis#SafetyLeverStatusInput": {
+            "type": "enum",
+            "members": {
+                "DISENGAGED": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "disengaged"
+                    }
+                },
+                "ENGAGED": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "engaged"
+                    }
+                }
+            }
+        },
+        "com.amazonaws.fis#SafetyLeverStatusReason": {
+            "type": "string"
+        },
         "com.amazonaws.fis#ServiceQuotaExceededException": {
             "type": "structure",
             "members": {
@@ -4994,6 +5157,93 @@
                 "target": "com.amazonaws.fis#UpdateExperimentTemplateTargetInput"
             }
         },
+        "com.amazonaws.fis#UpdateSafetyLeverState": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.fis#UpdateSafetyLeverStateRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.fis#UpdateSafetyLeverStateResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.fis#ConflictException"
+                },
+                {
+                    "target": "com.amazonaws.fis#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.fis#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>\n        Updates the specified safety lever state.\n      </p>",
+                "smithy.api#http": {
+                    "method": "PATCH",
+                    "uri": "/safetyLevers/{id}/state",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.fis#UpdateSafetyLeverStateInput": {
+            "type": "structure",
+            "members": {
+                "status": {
+                    "target": "com.amazonaws.fis#SafetyLeverStatusInput",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n       The updated state of the safety lever.\n      </p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "reason": {
+                    "target": "com.amazonaws.fis#SafetyLeverStatusReason",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n       The reason for updating the state of the safety lever.\n      </p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>\n        Specifies a state for a safety lever.\n      </p>"
+            }
+        },
+        "com.amazonaws.fis#UpdateSafetyLeverStateRequest": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.fis#SafetyLeverId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n         The ID of the safety lever.\n      </p>",
+                        "smithy.api#httpLabel": {},
+                        "smithy.api#required": {}
+                    }
+                },
+                "state": {
+                    "target": "com.amazonaws.fis#UpdateSafetyLeverStateInput",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n       The state of the safety lever.\n      </p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.fis#UpdateSafetyLeverStateResponse": {
+            "type": "structure",
+            "members": {
+                "safetyLever": {
+                    "target": "com.amazonaws.fis#SafetyLever",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n         Information about the safety lever.\n      </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.fis#UpdateTargetAccountConfiguration": {
             "type": "operation",
             "input": {
diff --git a/codegen/sdk-codegen/aws-models/s3-control.json b/codegen/sdk-codegen/aws-models/s3-control.json
index 718467956ed..3b8586d07b7 100644
--- a/codegen/sdk-codegen/aws-models/s3-control.json
+++ b/codegen/sdk-codegen/aws-models/s3-control.json
@@ -228,6 +228,9 @@
                 {
                     "target": "com.amazonaws.s3control#ListAccessPointsForObjectLambda"
                 },
+                {
+                    "target": "com.amazonaws.s3control#ListCallerAccessGrants"
+                },
                 {
                     "target": "com.amazonaws.s3control#ListJobs"
                 },
@@ -6666,7 +6669,7 @@
                 "VpcConfiguration": {
                     "target": "com.amazonaws.s3control#VpcConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The virtual private cloud (VPC) configuration for this access point, if one exists.</p>\n         <note>\n            <p>This element is empty if this access point is an Amazon S3 on Outposts access point that is used by other\n               Amazon Web Services.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>The virtual private cloud (VPC) configuration for this access point, if one exists.</p>\n         <note>\n            <p>This element is empty if this access point is an Amazon S3 on Outposts access point that is used by other\n               Amazon Web Servicesservices.</p>\n         </note>"
                     }
                 },
                 "Bucket": {
@@ -6859,7 +6862,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -7285,6 +7288,15 @@
                 }
             }
         },
+        "com.amazonaws.s3control#CallerAccessGrantsList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.s3control#ListCallerAccessGrantsEntry",
+                "traits": {
+                    "smithy.api#xmlName": "AccessGrant"
+                }
+            }
+        },
         "com.amazonaws.s3control#CloudWatchMetrics": {
             "type": "structure",
             "members": {
@@ -7358,7 +7370,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -7511,7 +7523,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -7555,13 +7567,28 @@
                 "AccessGrantsInstanceArn": {
                     "target": "com.amazonaws.s3control#AccessGrantsInstanceArn",
                     "traits": {
-                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the S3 Access Grants instance. </p>"
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the Amazon Web Services IAM Identity Center instance that you are associating with your S3 Access Grants instance. An IAM Identity Center instance is your corporate identity directory that you added to the IAM Identity Center. You can use the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListInstances.html\">ListInstances</a> API operation to retrieve a list of your Identity Center instances and their ARNs.</p>"
                     }
                 },
                 "IdentityCenterArn": {
                     "target": "com.amazonaws.s3control#IdentityCenterArn",
                     "traits": {
-                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance passed in the request. S3 Access Grants creates this Identity Center application for this specific S3 Access Grants instance.  </p>"
+                        "smithy.api#deprecated": {
+                            "message": "IdentityCenterArn has been deprecated. Use IdentityCenterInstanceArn or IdentityCenterApplicationArn."
+                        },
+                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
+                    }
+                },
+                "IdentityCenterInstanceArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the Amazon Web Services IAM Identity Center instance that you are associating with your S3 Access Grants instance. An IAM Identity Center instance is your corporate identity directory that you added to the IAM Identity Center. You can use the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListInstances.html\">ListInstances</a> API operation to retrieve a list of your Identity Center instances and their ARNs.</p>"
+                    }
+                },
+                "IdentityCenterApplicationArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterApplicationArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
                     }
                 }
             },
@@ -7601,7 +7628,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -8387,7 +8414,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -8441,7 +8468,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -8487,7 +8514,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -8533,7 +8560,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -9704,7 +9731,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -9738,7 +9765,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Specifies encryption-related information for an Amazon S3 bucket that is a destination for\n         replicated objects.</p>\n         <note>\n            <p>This is not supported by Amazon S3 on Outposts buckets.</p>\n         </note>"
+                "smithy.api#documentation": "<p>Specifies encryption-related information for an Amazon S3 bucket that is a destination for\n         replicated objects. If you're specifying a customer managed KMS key, we recommend using a fully qualified\n         KMS key ARN. If you use a KMS key alias instead, then KMS resolves the key within the\n         requester’s account. This behavior can result in data that's encrypted with a KMS key\n         that belongs to the requester, and not the bucket owner.</p>\n         <note>\n            <p>This is not supported by Amazon S3 on Outposts buckets.</p>\n         </note>"
             }
         },
         "com.amazonaws.s3control#Endpoints": {
@@ -9943,7 +9970,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -10036,7 +10063,7 @@
                 "target": "com.amazonaws.s3control#GetAccessGrantsInstanceResult"
             },
             "traits": {
-                "smithy.api#documentation": "<p>Retrieves the S3 Access Grants instance for a Region in your account. </p>\n         <dl>\n            <dt>Permissions</dt>\n            <dd>\n               <p>You must have the <code>s3:GetAccessGrantsInstance</code> permission to use this operation. </p>\n            </dd>\n         </dl>",
+                "smithy.api#documentation": "<p>Retrieves the S3 Access Grants instance for a Region in your account. </p>\n         <dl>\n            <dt>Permissions</dt>\n            <dd>\n               <p>You must have the <code>s3:GetAccessGrantsInstance</code> permission to use this operation. </p>\n            </dd>\n         </dl>\n         <note>\n            <p>\n               <code>GetAccessGrantsInstance</code> is not supported for cross-account access. You can only call the API from the account that owns the S3 Access Grants instance.</p>\n         </note>",
                 "smithy.api#endpoint": {
                     "hostPrefix": "{AccountId}."
                 },
@@ -10133,7 +10160,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -10179,7 +10206,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -10237,7 +10264,22 @@
                 "IdentityCenterArn": {
                     "target": "com.amazonaws.s3control#IdentityCenterArn",
                     "traits": {
-                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the Amazon Web Services IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
+                        "smithy.api#deprecated": {
+                            "message": "IdentityCenterArn has been deprecated. Use IdentityCenterInstanceArn or IdentityCenterApplicationArn."
+                        },
+                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
+                    }
+                },
+                "IdentityCenterInstanceArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the Amazon Web Services IAM Identity Center instance that you are associating with your S3 Access Grants instance. An IAM Identity Center instance is your corporate identity directory that you added to the IAM Identity Center. You can use the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListInstances.html\">ListInstances</a> API operation to retrieve a list of your Identity Center instances and their ARNs.</p>"
+                    }
+                },
+                "IdentityCenterApplicationArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterApplicationArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
                     }
                 },
                 "CreatedAt": {
@@ -10283,7 +10325,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -10846,7 +10888,7 @@
                 "VpcConfiguration": {
                     "target": "com.amazonaws.s3control#VpcConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>Contains the virtual private cloud (VPC) configuration for the specified access point.</p>\n         <note>\n            <p>This element is empty if this access point is an Amazon S3 on Outposts access point that is used by other\n               Amazon Web Services.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Contains the virtual private cloud (VPC) configuration for the specified access point.</p>\n         <note>\n            <p>This element is empty if this access point is an Amazon S3 on Outposts access point that is used by other\n               Amazon Web Servicesservices.</p>\n         </note>"
                     }
                 },
                 "PublicAccessBlockConfiguration": {
@@ -11360,7 +11402,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -12145,7 +12187,7 @@
                     "min": 10,
                     "max": 1224
                 },
-                "smithy.api#pattern": "^arn:[^:]+:sso:.*$"
+                "smithy.api#pattern": "^arn:[^:]+:sso::\\d{12}:application/.*$"
             }
         },
         "com.amazonaws.s3control#IdentityCenterArn": {
@@ -13015,19 +13057,19 @@
                 "MatchAnyPrefix": {
                     "target": "com.amazonaws.s3control#NonEmptyMaxLength1024StringList",
                     "traits": {
-                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         at the start of the object key string.</p>"
+                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         at the start of the object key string. Each KeyNameConstraint filter accepts an array of strings with a length of 1 string.</p>"
                     }
                 },
                 "MatchAnySuffix": {
                     "target": "com.amazonaws.s3control#NonEmptyMaxLength1024StringList",
                     "traits": {
-                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         at the end of the object key string.</p>"
+                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         at the end of the object key string. Each KeyNameConstraint filter accepts an array of strings with a length of 1 string.</p>"
                     }
                 },
                 "MatchAnySubstring": {
                     "target": "com.amazonaws.s3control#NonEmptyMaxLength1024StringList",
                     "traits": {
-                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         anywhere within the object key string.</p>"
+                        "smithy.api#documentation": "<p>If provided, the generated manifest includes objects where the specified string appears\n         anywhere within the object key string. Each KeyNameConstraint filter accepts an array of strings with a length of 1 string.</p>"
                     }
                 }
             },
@@ -13365,6 +13407,21 @@
                 },
                 "IdentityCenterArn": {
                     "target": "com.amazonaws.s3control#IdentityCenterArn",
+                    "traits": {
+                        "smithy.api#deprecated": {
+                            "message": "IdentityCenterArn has been deprecated. Use IdentityCenterInstanceArn or IdentityCenterApplicationArn."
+                        },
+                        "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
+                    }
+                },
+                "IdentityCenterInstanceArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the Amazon Web Services IAM Identity Center instance that you are associating with your S3 Access Grants instance. An IAM Identity Center instance is your corporate identity directory that you added to the IAM Identity Center. You can use the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_ListInstances.html\">ListInstances</a> API operation to retrieve a list of your Identity Center instances and their ARNs.</p>"
+                    }
+                },
+                "IdentityCenterApplicationArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterApplicationArn",
                     "traits": {
                         "smithy.api#documentation": "<p>If you associated your S3 Access Grants instance with an Amazon Web Services IAM Identity Center instance, this field returns the Amazon Resource Name (ARN) of the IAM Identity Center instance application; a subresource of the original Identity Center instance. S3 Access Grants creates this Identity Center application for the specific S3 Access Grants instance. </p>"
                     }
@@ -13411,7 +13468,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -13535,7 +13592,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -13597,7 +13654,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -13862,6 +13919,134 @@
                 "smithy.api#output": {}
             }
         },
+        "com.amazonaws.s3control#ListCallerAccessGrants": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.s3control#ListCallerAccessGrantsRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.s3control#ListCallerAccessGrantsResult"
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Returns a list of the access grants that were given to the caller using S3 Access Grants and that allow the caller to access the S3 data of the Amazon Web Services account specified in the request.</p>\n         <dl>\n            <dt>Permissions</dt>\n            <dd>\n               <p>You must have the <code>s3:ListCallerAccessGrants</code> permission to use this operation. </p>\n            </dd>\n         </dl>",
+                "smithy.api#endpoint": {
+                    "hostPrefix": "{AccountId}."
+                },
+                "smithy.api#http": {
+                    "method": "GET",
+                    "uri": "/v20180820/accessgrantsinstance/caller/grants",
+                    "code": 200
+                },
+                "smithy.api#httpChecksumRequired": {},
+                "smithy.api#paginated": {
+                    "inputToken": "NextToken",
+                    "outputToken": "NextToken",
+                    "items": "CallerAccessGrantsList",
+                    "pageSize": "MaxResults"
+                },
+                "smithy.rules#staticContextParams": {
+                    "RequiresAccountId": {
+                        "value": true
+                    }
+                }
+            }
+        },
+        "com.amazonaws.s3control#ListCallerAccessGrantsEntry": {
+            "type": "structure",
+            "members": {
+                "Permission": {
+                    "target": "com.amazonaws.s3control#Permission",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The type of permission granted, which can be one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>READ</code> - Grants read-only access to the S3 data.</p>\n            </li>\n            <li>\n               <p>\n                  <code>WRITE</code> - Grants write-only access to the S3 data.</p>\n            </li>\n            <li>\n               <p>\n                  <code>READWRITE</code> - Grants both read and write access to the S3 data.</p>\n            </li>\n         </ul>"
+                    }
+                },
+                "GrantScope": {
+                    "target": "com.amazonaws.s3control#S3Prefix",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The S3 path of the data to which you have been granted access. </p>"
+                    }
+                },
+                "ApplicationArn": {
+                    "target": "com.amazonaws.s3control#IdentityCenterApplicationArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of an Amazon Web Services IAM Identity Center application associated with your Identity Center instance. If the grant includes an application ARN, the grantee can only access the S3 data through this application. </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Part of <code>ListCallerAccessGrantsResult</code>. Each entry includes the\n         permission level (READ, WRITE, or READWRITE) and the grant scope of the access grant. If the grant also includes an application ARN, the grantee can only access the S3 data through this application.</p>"
+            }
+        },
+        "com.amazonaws.s3control#ListCallerAccessGrantsRequest": {
+            "type": "structure",
+            "members": {
+                "AccountId": {
+                    "target": "com.amazonaws.s3control#AccountId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
+                        "smithy.api#hostLabel": {},
+                        "smithy.api#httpHeader": "x-amz-account-id",
+                        "smithy.api#required": {},
+                        "smithy.rules#contextParam": {
+                            "name": "AccountId"
+                        }
+                    }
+                },
+                "GrantScope": {
+                    "target": "com.amazonaws.s3control#S3Prefix",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The S3 path of the data that you would like to access. Must start with <code>s3://</code>. You can optionally pass only the beginning characters of a path, and S3 Access Grants will search for all applicable grants for the path fragment. </p>",
+                        "smithy.api#httpQuery": "grantscope"
+                    }
+                },
+                "NextToken": {
+                    "target": "com.amazonaws.s3control#ContinuationToken",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A pagination token to request the next page of results. Pass this value into a subsequent <code>List Caller Access Grants</code> request in order to retrieve the next page of results.</p>",
+                        "smithy.api#httpQuery": "nextToken"
+                    }
+                },
+                "MaxResults": {
+                    "target": "com.amazonaws.s3control#MaxResults",
+                    "traits": {
+                        "smithy.api#default": 0,
+                        "smithy.api#documentation": "<p>The maximum number of access grants that you would like returned in the <code>List Caller Access Grants</code> response. If the results include the pagination token <code>NextToken</code>, make another call using the <code>NextToken</code> to determine if there are more results.</p>",
+                        "smithy.api#httpQuery": "maxResults"
+                    }
+                },
+                "AllowedByApplication": {
+                    "target": "com.amazonaws.s3control#Boolean",
+                    "traits": {
+                        "smithy.api#default": false,
+                        "smithy.api#documentation": "<p>If this optional parameter is passed in the request, a filter is applied to the results. The results will include only the access grants for the caller's Identity Center application or for any other applications (<code>ALL</code>).</p>",
+                        "smithy.api#httpQuery": "allowedByApplication"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.s3control#ListCallerAccessGrantsResult": {
+            "type": "structure",
+            "members": {
+                "NextToken": {
+                    "target": "com.amazonaws.s3control#ContinuationToken",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A pagination token that you can use to request the next page of results. Pass this value into a subsequent <code>List Caller Access Grants</code> request in order to retrieve the next page of results.</p>"
+                    }
+                },
+                "CallerAccessGrantsList": {
+                    "target": "com.amazonaws.s3control#CallerAccessGrantsList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A list of the caller's access grants that were created using S3 Access Grants and that grant the caller access to the S3 data of the Amazon Web Services account ID that was specified in the request. </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.s3control#ListJobs": {
             "type": "operation",
             "input": {
@@ -15547,7 +15732,7 @@
                     "target": "com.amazonaws.s3control#Setting",
                     "traits": {
                         "smithy.api#default": false,
-                        "smithy.api#documentation": "<p>Specifies whether Amazon S3 should restrict public bucket policies for buckets in this\n         account. Setting this element to <code>TRUE</code> restricts access to buckets with public\n         policies to only Amazon Web Service principals and authorized users within this\n         account.</p>\n         <p>Enabling this setting doesn't affect previously stored bucket policies, except that\n         public and cross-account access within any public bucket policy, including non-public\n         delegation to specific accounts, is blocked.</p>\n         <p>This property is not supported for Amazon S3 on Outposts.</p>",
+                        "smithy.api#documentation": "<p>Specifies whether Amazon S3 should restrict public bucket policies for buckets in this\n         account. Setting this element to <code>TRUE</code> restricts access to buckets with public\n         policies to only Amazon Web Servicesservice principals and authorized users within this\n         account.</p>\n         <p>Enabling this setting doesn't affect previously stored bucket policies, except that\n         public and cross-account access within any public bucket policy, including non-public\n         delegation to specific accounts, is blocked.</p>\n         <p>This property is not supported for Amazon S3 on Outposts.</p>",
                         "smithy.api#xmlName": "RestrictPublicBuckets"
                     }
                 }
@@ -15594,7 +15779,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},
@@ -17537,7 +17722,7 @@
                 "SourceBucket": {
                     "target": "com.amazonaws.s3control#S3BucketArnString",
                     "traits": {
-                        "smithy.api#documentation": "<p>The source bucket used by the ManifestGenerator.</p>\n         <note>\n            <p>\n               <b>Directory buckets</b> - Directory buckets aren't supported \n         as the source buckets used by <code>S3JobManifestGenerator</code> to generate the job manifest.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>The ARN of the source bucket used by the ManifestGenerator.</p>\n         <note>\n            <p>\n               <b>Directory buckets</b> - Directory buckets aren't supported \n         as the source buckets used by <code>S3JobManifestGenerator</code> to generate the job manifest.</p>\n         </note>",
                         "smithy.api#required": {}
                     }
                 },
@@ -19112,7 +19297,7 @@
                 "AccountId": {
                     "target": "com.amazonaws.s3control#AccountId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the Amazon Web Services account that is making this request.</p>",
+                        "smithy.api#documentation": "<p>The Amazon Web Services account ID of the S3 Access Grants instance.</p>",
                         "smithy.api#hostLabel": {},
                         "smithy.api#httpHeader": "x-amz-account-id",
                         "smithy.api#required": {},