From 2b2a737b179ea3b7b699584ff6c391619b8f6de3 Mon Sep 17 00:00:00 2001
From: AWS SDK for Go v2 automation user <aws-sdk-go-v2-github@amazon.com>
Date: Wed, 6 Nov 2024 19:06:23 +0000
Subject: [PATCH] Update API model

---
 codegen/sdk-codegen/aws-models/codebuild.json |  87 ++-
 codegen/sdk-codegen/aws-models/guardduty.json | 176 ++++--
 .../sdk-codegen/aws-models/lakeformation.json | 504 ++++++++++++++++-
 codegen/sdk-codegen/aws-models/qapps.json     | 511 +++++++++++++++++-
 .../sdk-codegen/aws-models/s3-control.json    |  15 +-
 .../aws-models/verifiedpermissions.json       | 326 ++++++++++-
 6 files changed, 1518 insertions(+), 101 deletions(-)

diff --git a/codegen/sdk-codegen/aws-models/codebuild.json b/codegen/sdk-codegen/aws-models/codebuild.json
index 354755fa523..ad19aa82eb5 100644
--- a/codegen/sdk-codegen/aws-models/codebuild.json
+++ b/codegen/sdk-codegen/aws-models/codebuild.json
@@ -2800,6 +2800,38 @@
                 "target": "com.amazonaws.codebuild#CodeCoverage"
             }
         },
+        "com.amazonaws.codebuild#ComputeConfiguration": {
+            "type": "structure",
+            "members": {
+                "vCpu": {
+                    "target": "com.amazonaws.codebuild#WrapperLong",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The number of vCPUs of the instance type included in your fleet.</p>"
+                    }
+                },
+                "memory": {
+                    "target": "com.amazonaws.codebuild#WrapperLong",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The amount of memory of the instance type included in your fleet.</p>"
+                    }
+                },
+                "disk": {
+                    "target": "com.amazonaws.codebuild#WrapperLong",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The amount of disk space of the instance type included in your fleet.</p>"
+                    }
+                },
+                "machineType": {
+                    "target": "com.amazonaws.codebuild#MachineType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The machine type of the instance type included in your fleet.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains compute attributes. These attributes only need be specified when your project's or fleet's <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
+            }
+        },
         "com.amazonaws.codebuild#ComputeType": {
             "type": "enum",
             "members": {
@@ -2862,6 +2894,12 @@
                     "traits": {
                         "smithy.api#enumValue": "BUILD_LAMBDA_10GB"
                     }
+                },
+                "ATTRIBUTE_BASED_COMPUTE": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "ATTRIBUTE_BASED_COMPUTE"
+                    }
                 }
             }
         },
@@ -2921,10 +2959,16 @@
                 "computeType": {
                     "target": "com.amazonaws.codebuild#ComputeType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 70 GB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 145 GB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 3 GB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 15 GB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build environment\n            compute types</a> in the <i>CodeBuild User Guide.</i>\n         </p>",
+                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ATTRIBUTE_BASED_COMPUTE</code>: Specify the amount of vCPUs, memory, disk space, and the type of machine.</p>\n               <note>\n                  <p> If you use <code>ATTRIBUTE_BASED_COMPUTE</code>, you must define your attributes by using <code>computeConfiguration</code>. CodeBuild \n                        will select the cheapest instance that satisfies your specified attributes. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment-reserved-capacity.types\">Reserved capacity environment \n                        types</a> in the <i>CodeBuild User Guide</i>.</p>\n               </note>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 4 GiB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 8 GiB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GiB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 72 GiB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 144 GiB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_1GB</code>: Use up to 1 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_2GB</code>: Use up to 2 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_4GB</code>: Use up to 4 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_8GB</code>: Use up to 8 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_10GB</code>: Use up to 10 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GiB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GiB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment.types\">On-demand environment types</a> \n                in the <i>CodeBuild User Guide.</i>\n         </p>",
                         "smithy.api#required": {}
                     }
                 },
+                "computeConfiguration": {
+                    "target": "com.amazonaws.codebuild#ComputeConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The compute configuration of the compute fleet. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
+                    }
+                },
                 "scalingConfiguration": {
                     "target": "com.amazonaws.codebuild#ScalingConfigurationInput",
                     "traits": {
@@ -4177,7 +4221,13 @@
                 "computeType": {
                     "target": "com.amazonaws.codebuild#ComputeType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 70 GB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 145 GB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 3 GB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 15 GB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build environment\n            compute types</a> in the <i>CodeBuild User Guide.</i>\n         </p>"
+                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ATTRIBUTE_BASED_COMPUTE</code>: Specify the amount of vCPUs, memory, disk space, and the type of machine.</p>\n               <note>\n                  <p> If you use <code>ATTRIBUTE_BASED_COMPUTE</code>, you must define your attributes by using <code>computeConfiguration</code>. CodeBuild \n                        will select the cheapest instance that satisfies your specified attributes. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment-reserved-capacity.types\">Reserved capacity environment \n                        types</a> in the <i>CodeBuild User Guide</i>.</p>\n               </note>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 4 GiB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 8 GiB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GiB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 72 GiB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 144 GiB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_1GB</code>: Use up to 1 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_2GB</code>: Use up to 2 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_4GB</code>: Use up to 4 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_8GB</code>: Use up to 8 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_10GB</code>: Use up to 10 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GiB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GiB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment.types\">On-demand environment types</a> \n                in the <i>CodeBuild User Guide.</i>\n         </p>"
+                    }
+                },
+                "computeConfiguration": {
+                    "target": "com.amazonaws.codebuild#ComputeConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The compute configuration of the compute fleet. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
                     }
                 },
                 "scalingConfiguration": {
@@ -5931,6 +5981,23 @@
                 "smithy.api#documentation": "<p>Information about build logs in CloudWatch Logs.</p>"
             }
         },
+        "com.amazonaws.codebuild#MachineType": {
+            "type": "enum",
+            "members": {
+                "GENERAL": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "GENERAL"
+                    }
+                },
+                "NVME": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "NVME"
+                    }
+                }
+            }
+        },
         "com.amazonaws.codebuild#NetworkInterface": {
             "type": "structure",
             "members": {
@@ -6442,10 +6509,16 @@
                 "computeType": {
                     "target": "com.amazonaws.codebuild#ComputeType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Information about the compute resources the build project uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 70 GB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 145 GB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_1GB</code>: Use up to 1 GB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_2GB</code>: Use up to 2 GB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_4GB</code>: Use up to 4 GB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_8GB</code>: Use up to 8 GB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_10GB</code>: Use up to 10 GB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 3 GB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 15 GB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <note>\n            <p>If you're using compute fleets during project creation, <code>computeType</code> will be ignored.</p>\n         </note>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build Environment\n                Compute Types</a> in the <i>CodeBuild User Guide.</i>\n         </p>",
+                        "smithy.api#documentation": "<p>Information about the compute resources the build project uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ATTRIBUTE_BASED_COMPUTE</code>: Specify the amount of vCPUs, memory, disk space, and the type of machine.</p>\n               <note>\n                  <p> If you use <code>ATTRIBUTE_BASED_COMPUTE</code>, you must define your attributes by using <code>computeConfiguration</code>. CodeBuild \n                        will select the cheapest instance that satisfies your specified attributes. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment-reserved-capacity.types\">Reserved capacity environment \n                        types</a> in the <i>CodeBuild User Guide</i>.</p>\n               </note>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 4 GiB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 8 GiB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GiB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 72 GiB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 144 GiB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_1GB</code>: Use up to 1 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_2GB</code>: Use up to 2 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_4GB</code>: Use up to 4 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_8GB</code>: Use up to 8 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_10GB</code>: Use up to 10 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GiB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GiB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment.types\">On-demand environment types</a> \n                in the <i>CodeBuild User Guide.</i>\n         </p>",
                         "smithy.api#required": {}
                     }
                 },
+                "computeConfiguration": {
+                    "target": "com.amazonaws.codebuild#ComputeConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The compute configuration of the build project. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
+                    }
+                },
                 "fleet": {
                     "target": "com.amazonaws.codebuild#ProjectFleet",
                     "traits": {
@@ -8753,7 +8826,13 @@
                 "computeType": {
                     "target": "com.amazonaws.codebuild#ComputeType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 70 GB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 145 GB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 3 GB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 15 GB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build environment\n            compute types</a> in the <i>CodeBuild User Guide.</i>\n         </p>"
+                        "smithy.api#documentation": "<p>Information about the compute resources the compute fleet uses. Available values\n            include:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>ATTRIBUTE_BASED_COMPUTE</code>: Specify the amount of vCPUs, memory, disk space, and the type of machine.</p>\n               <note>\n                  <p> If you use <code>ATTRIBUTE_BASED_COMPUTE</code>, you must define your attributes by using <code>computeConfiguration</code>. CodeBuild \n                        will select the cheapest instance that satisfies your specified attributes. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment-reserved-capacity.types\">Reserved capacity environment \n                        types</a> in the <i>CodeBuild User Guide</i>.</p>\n               </note>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_SMALL</code>: Use up to 4 GiB memory and 2 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 8 GiB memory and 4 vCPUs for\n                    builds.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GiB memory and 8 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_XLARGE</code>: Use up to 72 GiB memory and 36 vCPUs for\n                    builds, depending on your environment type.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 144 GiB memory, 72 vCPUs, and\n                    824 GB of SSD storage for builds. This compute type supports Docker images up to\n                    100 GB uncompressed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_1GB</code>: Use up to 1 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_2GB</code>: Use up to 2 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_4GB</code>: Use up to 4 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_8GB</code>: Use up to 8 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n            <li>\n               <p>\n                  <code>BUILD_LAMBDA_10GB</code>: Use up to 10 GiB memory for\n                    builds. Only available for environment type <code>LINUX_LAMBDA_CONTAINER</code> and <code>ARM_LAMBDA_CONTAINER</code>.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_SMALL</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 16\n                    GiB memory, 4 vCPUs, and 1 NVIDIA A10G Tensor Core GPU for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 4 GiB\n                    memory and 2 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p>\n         <ul>\n            <li>\n               <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs for builds. </p>\n            </li>\n            <li>\n               <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255\n                    GiB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p>\n            </li>\n            <li>\n               <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GiB\n                    memory and 8 vCPUs on ARM-based processors for builds.</p>\n            </li>\n         </ul>\n         <p>For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html#environment.types\">On-demand environment types</a> \n                in the <i>CodeBuild User Guide.</i>\n         </p>"
+                    }
+                },
+                "computeConfiguration": {
+                    "target": "com.amazonaws.codebuild#ComputeConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The compute configuration of the compute fleet. This is only required if <code>computeType</code> is set to <code>ATTRIBUTE_BASED_COMPUTE</code>.</p>"
                     }
                 },
                 "scalingConfiguration": {
diff --git a/codegen/sdk-codegen/aws-models/guardduty.json b/codegen/sdk-codegen/aws-models/guardduty.json
index e81b116ea54..cf660a6bb83 100644
--- a/codegen/sdk-codegen/aws-models/guardduty.json
+++ b/codegen/sdk-codegen/aws-models/guardduty.json
@@ -130,7 +130,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -742,7 +742,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      archive.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      archive.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -1916,7 +1916,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detector ID associated with the GuardDuty account for which you want to create a filter.</p>",
+                        "smithy.api#documentation": "<p>The detector ID associated with the GuardDuty account for which you want to create a filter.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -2029,7 +2029,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to create an IPSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to create an IPSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -2233,7 +2233,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to associate member\n      accounts.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to associate member\n      accounts.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -2316,7 +2316,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the GuardDuty detector associated with the publishing destination.</p>",
+                        "smithy.api#documentation": "<p>The ID of the GuardDuty detector associated with the publishing destination.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -2423,7 +2423,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector for which you need to create sample findings.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector for which you need to create sample findings.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -2479,7 +2479,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to create a\n      <code>ThreatIntelSet</code>.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account for which you want to create a\n      <code>ThreatIntelSet</code>.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3001,7 +3001,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that you want to delete.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that you want to delete.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3050,7 +3050,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the filter.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the filter.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3108,7 +3108,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the IPSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the IPSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3273,7 +3273,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account whose members you want to\n      delete.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account whose members you want to\n      delete.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3341,7 +3341,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the publishing destination to delete.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the publishing destination to delete.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3399,7 +3399,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3463,7 +3463,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that the request is associated with.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that the request is associated with.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3562,7 +3562,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detector ID of the delegated administrator for which you need to retrieve the information.</p>",
+                        "smithy.api#documentation": "<p>The detector ID of the delegated administrator for which you need to retrieve the information.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -3678,7 +3678,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the publishing destination to\n      retrieve.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the publishing destination to\n      retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -5610,7 +5610,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the GuardDuty detector.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the GuardDuty detector.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -5683,7 +5683,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that you want to get.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that you want to get.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -5796,7 +5796,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with this filter.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with this filter.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -5903,7 +5903,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      retrieve.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -5978,7 +5978,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector whose findings statistics you\n      want to retrieve.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector whose findings statistics you\n      want to retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6082,7 +6082,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the IPSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the IPSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6343,7 +6343,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with this scan.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with this scan.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6410,7 +6410,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6475,7 +6475,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detector ID for the administrator account.</p>",
+                        "smithy.api#documentation": "<p>The detector ID for the administrator account.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6552,7 +6552,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account whose members you want to\n      retrieve.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account whose members you want to\n      retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6669,7 +6669,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty member account.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6740,7 +6740,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -6847,7 +6847,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose usage statistics you\n      want to retrieve.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose usage statistics you\n      want to retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -8551,7 +8551,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account with which you want to invite members.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty account with which you want to invite members.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -9363,7 +9363,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector whose coverage details you want to retrieve.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector whose coverage details you want to retrieve.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -9542,7 +9542,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the filter.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the filter.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -9630,7 +9630,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      list.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that specifies the GuardDuty service whose findings you want to\n      list.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -9730,7 +9730,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with IPSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with IPSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -9961,7 +9961,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the member.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the member.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -10131,7 +10131,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detector ID for which you want to retrieve the publishing destination.</p>",
+                        "smithy.api#documentation": "<p>The detector ID for which you want to retrieve the publishing destination.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -10279,7 +10279,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that is associated with the threatIntelSet.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -12242,7 +12242,7 @@
                 "Tags": {
                     "target": "com.amazonaws.guardduty#Tags",
                     "traits": {
-                        "smithy.api#documentation": "<p>Instance tag key-value pairs associated with the database instance ID.</p>",
+                        "smithy.api#documentation": "<p>Information about the tag key-value pairs.</p>",
                         "smithy.api#jsonName": "tags"
                     }
                 }
@@ -12294,6 +12294,63 @@
                 "smithy.api#documentation": "<p>Contains information about the user and authentication details for a database instance\n      involved in the finding.</p>"
             }
         },
+        "com.amazonaws.guardduty#RdsLimitlessDbDetails": {
+            "type": "structure",
+            "members": {
+                "DbShardGroupIdentifier": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name associated with the Limitless DB shard group.</p>",
+                        "smithy.api#jsonName": "dbShardGroupIdentifier"
+                    }
+                },
+                "DbShardGroupResourceId": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The resource identifier of the DB shard group within the Limitless Database.</p>",
+                        "smithy.api#jsonName": "dbShardGroupResourceId"
+                    }
+                },
+                "DbShardGroupArn": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) that identifies the DB shard group.</p>",
+                        "smithy.api#jsonName": "dbShardGroupArn"
+                    }
+                },
+                "Engine": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The database engine of the database instance involved in the finding.</p>",
+                        "smithy.api#jsonName": "engine"
+                    }
+                },
+                "EngineVersion": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The version of the database engine.</p>",
+                        "smithy.api#jsonName": "engineVersion"
+                    }
+                },
+                "DbClusterIdentifier": {
+                    "target": "com.amazonaws.guardduty#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the database cluster that is a part of the Limitless Database.</p>",
+                        "smithy.api#jsonName": "dbClusterIdentifier"
+                    }
+                },
+                "Tags": {
+                    "target": "com.amazonaws.guardduty#Tags",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Information about the tag-key value pair.</p>",
+                        "smithy.api#jsonName": "tags"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains information about the resource type <code>RDSLimitlessDB</code> that is involved in a GuardDuty\n    finding.</p>"
+            }
+        },
         "com.amazonaws.guardduty#RdsLoginAttemptAction": {
             "type": "structure",
             "members": {
@@ -12480,6 +12537,13 @@
                         "smithy.api#jsonName": "rdsDbInstanceDetails"
                     }
                 },
+                "RdsLimitlessDbDetails": {
+                    "target": "com.amazonaws.guardduty#RdsLimitlessDbDetails",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Contains information about the RDS Limitless database that was involved in a GuardDuty finding.</p>",
+                        "smithy.api#jsonName": "rdsLimitlessDbDetails"
+                    }
+                },
                 "RdsDbUserDetails": {
                     "target": "com.amazonaws.guardduty#RdsDbUserDetails",
                     "traits": {
@@ -12987,14 +13051,14 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that the request is associated with.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that the request is associated with.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#jsonName": "detectorId"
                     }
                 },
                 "AdminDetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique detector ID of the administrator account that the request is associated with.\n      If the account is an administrator, the <code>AdminDetectorId</code> will be the same as the one used for \n      <code>DetectorId</code>.</p>",
+                        "smithy.api#documentation": "<p>The unique detector ID of the administrator account that the request is associated with.\n      If the account is an administrator, the <code>AdminDetectorId</code> will be the same as the one used for \n      <code>DetectorId</code>.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#jsonName": "adminDetectorId"
                     }
                 },
@@ -13798,7 +13862,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty administrator account associated with the\n      member accounts to monitor.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector of the GuardDuty administrator account associated with the\n      member accounts to monitor.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -13866,7 +13930,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the GuardDuty administrator account that is\n      monitoring member accounts.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector associated with the GuardDuty administrator account that is\n      monitoring member accounts.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -13918,20 +13982,20 @@
                 "Key": {
                     "target": "com.amazonaws.guardduty#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>The EC2 instance tag key.</p>",
+                        "smithy.api#documentation": "<p>Describes the key associated with the tag.</p>",
                         "smithy.api#jsonName": "key"
                     }
                 },
                 "Value": {
                     "target": "com.amazonaws.guardduty#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>The EC2 instance tag value.</p>",
+                        "smithy.api#documentation": "<p>Describes the value associated with the tag key.</p>",
                         "smithy.api#jsonName": "value"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Contains information about a tag associated with the EC2 instance.</p>"
+                "smithy.api#documentation": "<p>Contains information about a tag key-value pair.</p>"
             }
         },
         "com.amazonaws.guardduty#TagKey": {
@@ -14364,7 +14428,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector associated with the findings to unarchive.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector associated with the findings to unarchive.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14536,7 +14600,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector to update.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector to update.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14616,7 +14680,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that specifies the GuardDuty service where you want to\n      update a filter.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that specifies the GuardDuty service where you want to\n      update a filter.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14712,7 +14776,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that is associated with the findings for which you want to update \n      the feedback.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that is associated with the findings for which you want to update \n      the feedback.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14786,7 +14850,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detectorID that specifies the GuardDuty service whose IPSet you want to update.</p>",
+                        "smithy.api#documentation": "<p>The detectorID that specifies the GuardDuty service whose IPSet you want to update.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14934,7 +14998,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The unique ID of the detector that specifies the GuardDuty service where you want to\n      update scan settings.</p>",
+                        "smithy.api#documentation": "<p>The unique ID of the detector that specifies the GuardDuty service where you want to\n      update scan settings.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -14997,7 +15061,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detector ID of the administrator account.</p>",
+                        "smithy.api#documentation": "<p>The detector ID of the administrator account.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -15082,7 +15146,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector that configures the delegated administrator.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector that configures the delegated administrator.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -15180,7 +15244,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the detector associated with the publishing destinations to update.</p>",
+                        "smithy.api#documentation": "<p>The ID of the detector associated with the publishing destinations to update.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
@@ -15260,7 +15324,7 @@
                 "DetectorId": {
                     "target": "com.amazonaws.guardduty#DetectorId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The detectorID that specifies the GuardDuty service whose ThreatIntelSet you want to\n      update.</p>",
+                        "smithy.api#documentation": "<p>The detectorID that specifies the GuardDuty service whose ThreatIntelSet you want to\n      update.</p>\n         <p>To find the <code>detectorId</code> in the current Region, see the\nSettings page in the GuardDuty console, or run the <a href=\"https://docs.aws.amazon.com/guardduty/latest/APIReference/API_ListDetectors.html\">ListDetectors</a> API.</p>",
                         "smithy.api#httpLabel": {},
                         "smithy.api#jsonName": "detectorId",
                         "smithy.api#required": {}
diff --git a/codegen/sdk-codegen/aws-models/lakeformation.json b/codegen/sdk-codegen/aws-models/lakeformation.json
index 0b9715a0a5b..b9747fcf0ec 100644
--- a/codegen/sdk-codegen/aws-models/lakeformation.json
+++ b/codegen/sdk-codegen/aws-models/lakeformation.json
@@ -63,6 +63,9 @@
                 {
                     "target": "com.amazonaws.lakeformation#CreateLFTag"
                 },
+                {
+                    "target": "com.amazonaws.lakeformation#CreateLFTagExpression"
+                },
                 {
                     "target": "com.amazonaws.lakeformation#DeleteDataCellsFilter"
                 },
@@ -75,6 +78,9 @@
                 {
                     "target": "com.amazonaws.lakeformation#DeleteLFTag"
                 },
+                {
+                    "target": "com.amazonaws.lakeformation#DeleteLFTagExpression"
+                },
                 {
                     "target": "com.amazonaws.lakeformation#DeleteObjectsOnCancel"
                 },
@@ -108,6 +114,9 @@
                 {
                     "target": "com.amazonaws.lakeformation#GetLFTag"
                 },
+                {
+                    "target": "com.amazonaws.lakeformation#GetLFTagExpression"
+                },
                 {
                     "target": "com.amazonaws.lakeformation#GetQueryState"
                 },
@@ -141,6 +150,9 @@
                 {
                     "target": "com.amazonaws.lakeformation#ListLakeFormationOptIns"
                 },
+                {
+                    "target": "com.amazonaws.lakeformation#ListLFTagExpressions"
+                },
                 {
                     "target": "com.amazonaws.lakeformation#ListLFTags"
                 },
@@ -189,6 +201,9 @@
                 {
                     "target": "com.amazonaws.lakeformation#UpdateLFTag"
                 },
+                {
+                    "target": "com.amazonaws.lakeformation#UpdateLFTagExpression"
+                },
                 {
                     "target": "com.amazonaws.lakeformation#UpdateResource"
                 },
@@ -2085,6 +2100,84 @@
                 }
             }
         },
+        "com.amazonaws.lakeformation#CreateLFTagExpression": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.lakeformation#CreateLFTagExpressionRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.lakeformation#CreateLFTagExpressionResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.lakeformation#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#EntityNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InternalServiceException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InvalidInputException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#OperationTimeoutException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#ResourceNumberLimitExceededException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Creates a new LF-Tag expression with the provided name, description, catalog ID, and\n      expression body. This call fails if a LF-Tag expression with the same name already exists in\n      the caller’s account or if the underlying LF-Tags don't exist. To call this API operation,\n      caller needs the following Lake Formation permissions:</p>\n         <p>\n            <code>CREATE_LF_TAG_EXPRESSION</code> on the root catalog resource.</p>\n         <p>\n            <code>GRANT_WITH_LF_TAG_EXPRESSION</code> on all underlying LF-Tag key:value pairs\n      included in the expression. </p>",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/CreateLFTagExpression",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.lakeformation#CreateLFTagExpressionRequest": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A name for the expression.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "Description": {
+                    "target": "com.amazonaws.lakeformation#DescriptionString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A description with information about the LF-Tag expression.</p>"
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID. The Data Catalog is the persistent metadata store. It contains database definitions, table definitions, and other control information to manage your Lake Formation environment. </p>"
+                    }
+                },
+                "Expression": {
+                    "target": "com.amazonaws.lakeformation#Expression",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A list of LF-Tag conditions (key-value pairs).</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.lakeformation#CreateLFTagExpressionResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.lakeformation#CreateLFTagRequest": {
             "type": "structure",
             "members": {
@@ -2459,6 +2552,12 @@
                     "traits": {
                         "smithy.api#enumValue": "LF_TAG_POLICY_TABLE"
                     }
+                },
+                "LF_NAMED_TAG_EXPRESSION": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "LF_NAMED_TAG_EXPRESSION"
+                    }
                 }
             }
         },
@@ -2691,6 +2790,68 @@
                 }
             }
         },
+        "com.amazonaws.lakeformation#DeleteLFTagExpression": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.lakeformation#DeleteLFTagExpressionRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.lakeformation#DeleteLFTagExpressionResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.lakeformation#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#EntityNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InternalServiceException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InvalidInputException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#OperationTimeoutException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Deletes the LF-Tag expression. The caller must be a data lake admin or have <code>DROP</code> permissions on the LF-Tag expression.\n      Deleting a LF-Tag expression will also delete all <code>LFTagPolicy</code> permissions referencing the LF-Tag expression.</p>",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/DeleteLFTagExpression",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.lakeformation#DeleteLFTagExpressionRequest": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name for the LF-Tag expression.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID in which the LF-Tag expression is saved. </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.lakeformation#DeleteLFTagExpressionResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.lakeformation#DeleteLFTagRequest": {
             "type": "structure",
             "members": {
@@ -3824,6 +3985,93 @@
                 }
             }
         },
+        "com.amazonaws.lakeformation#GetLFTagExpression": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.lakeformation#GetLFTagExpressionRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.lakeformation#GetLFTagExpressionResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.lakeformation#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#EntityNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InternalServiceException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InvalidInputException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#OperationTimeoutException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Returns the details about the LF-Tag expression. The caller must be a data lake admin or must have <code>DESCRIBE</code> permission on the LF-Tag expression resource.\n     </p>",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/GetLFTagExpression",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.lakeformation#GetLFTagExpressionRequest": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name for the LF-Tag expression</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.lakeformation#GetLFTagExpressionResponse": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name for the LF-Tag expression. </p>"
+                    }
+                },
+                "Description": {
+                    "target": "com.amazonaws.lakeformation#DescriptionString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The description with information about the LF-Tag expression.</p>"
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID in which the LF-Tag expression is saved.</p>"
+                    }
+                },
+                "Expression": {
+                    "target": "com.amazonaws.lakeformation#Expression",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The body of the LF-Tag expression. It is composed of one or more LF-Tag key-value pairs.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.lakeformation#GetLFTagRequest": {
             "type": "structure",
             "members": {
@@ -4395,7 +4643,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Allows a caller in a secure environment to assume a role with permission to access Amazon S3. In order to vend such credentials, Lake Formation assumes the role associated with a registered location, for example an Amazon S3 bucket, with a scope down policy which restricts the access to a single prefix.</p>",
+                "smithy.api#documentation": "<p>Allows a caller in a secure environment to assume a role with permission to access Amazon S3. In order to vend such credentials, Lake Formation assumes the role associated with a registered location, for example an Amazon S3 bucket, with a scope down policy which restricts the access to a single prefix.</p>\n         <p>To call this API, the role that the service assumes must have <code>lakeformation:GetDataAccess</code> permission on the resource.</p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/GetTemporaryGlueTableCredentials",
@@ -4920,6 +5168,65 @@
                 "target": "com.amazonaws.lakeformation#LFTagError"
             }
         },
+        "com.amazonaws.lakeformation#LFTagExpression": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name for saved the LF-Tag expression.</p>"
+                    }
+                },
+                "Description": {
+                    "target": "com.amazonaws.lakeformation#DescriptionString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A structure that contains information about the LF-Tag expression.</p>"
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID. </p>"
+                    }
+                },
+                "Expression": {
+                    "target": "com.amazonaws.lakeformation#Expression",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A logical expression composed of one or more LF-Tags.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>A structure consists LF-Tag expression name and catalog ID.</p>"
+            }
+        },
+        "com.amazonaws.lakeformation#LFTagExpressionResource": {
+            "type": "structure",
+            "members": {
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID. </p>"
+                    }
+                },
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the LF-Tag expression to grant permissions on.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>A structure containing a LF-Tag expression (keys and values).</p>"
+            }
+        },
+        "com.amazonaws.lakeformation#LFTagExpressionsList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.lakeformation#LFTagExpression"
+            }
+        },
         "com.amazonaws.lakeformation#LFTagKey": {
             "type": "string",
             "traits": {
@@ -5005,13 +5312,20 @@
                 "Expression": {
                     "target": "com.amazonaws.lakeformation#Expression",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of LF-tag conditions that apply to the resource's LF-tag policy.</p>",
-                        "smithy.api#required": {}
+                        "smithy.api#addedDefault": {},
+                        "smithy.api#default": [],
+                        "smithy.api#documentation": "<p>A list of LF-tag conditions or a saved expression that apply to the resource's LF-tag policy.</p>"
+                    }
+                },
+                "ExpressionName": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>If provided, permissions are granted to the Data Catalog resources whose assigned LF-Tags\n      match the expression body of the saved expression under the provided\n        <code>ExpressionName</code>.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>A structure containing a list of LF-tag conditions that apply to a resource's LF-tag policy.</p>"
+                "smithy.api#documentation": "<p>A structure containing a list of LF-tag conditions or saved LF-Tag expressions that apply to a resource's LF-tag policy.</p>"
             }
         },
         "com.amazonaws.lakeformation#LFTagValue": {
@@ -5154,6 +5468,92 @@
                 "smithy.api#output": {}
             }
         },
+        "com.amazonaws.lakeformation#ListLFTagExpressions": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.lakeformation#ListLFTagExpressionsRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.lakeformation#ListLFTagExpressionsResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.lakeformation#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#EntityNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InternalServiceException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InvalidInputException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#OperationTimeoutException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Returns the LF-Tag expressions in caller’s account filtered based on caller's permissions. Data Lake and read only admins implicitly can see all tag expressions in their account, else caller needs DESCRIBE permissions on tag expression.</p>",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/ListLFTagExpressions",
+                    "code": 200
+                },
+                "smithy.api#paginated": {
+                    "inputToken": "NextToken",
+                    "outputToken": "NextToken",
+                    "items": "LFTagExpressions",
+                    "pageSize": "MaxResults"
+                }
+            }
+        },
+        "com.amazonaws.lakeformation#ListLFTagExpressionsRequest": {
+            "type": "structure",
+            "members": {
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID. </p>"
+                    }
+                },
+                "MaxResults": {
+                    "target": "com.amazonaws.lakeformation#PageSize",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The maximum number of results to return.</p>"
+                    }
+                },
+                "NextToken": {
+                    "target": "com.amazonaws.lakeformation#Token",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A continuation token, if this is not the first call to retrieve this list.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.lakeformation#ListLFTagExpressionsResponse": {
+            "type": "structure",
+            "members": {
+                "LFTagExpressions": {
+                    "target": "com.amazonaws.lakeformation#LFTagExpressionsList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Logical expressions composed of one more LF-Tag key-value pairs.</p>"
+                    }
+                },
+                "NextToken": {
+                    "target": "com.amazonaws.lakeformation#Token",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A continuation token, if this is not the first call to retrieve this list.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.lakeformation#ListLFTags": {
             "type": "operation",
             "input": {
@@ -5959,6 +6359,12 @@
                     "traits": {
                         "smithy.api#enumValue": "GRANT_WITH_LF_TAG_EXPRESSION"
                     }
+                },
+                "CREATE_LF_TAG_EXPRESSION": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "CREATE_LF_TAG_EXPRESSION"
+                    }
                 }
             }
         },
@@ -6373,7 +6779,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Registers the resource as managed by the Data Catalog.</p>\n         <p>To add or update data, Lake Formation needs read/write access to the chosen Amazon S3 path. Choose a role that you know has permission to do this, or choose the AWSServiceRoleForLakeFormationDataAccess service-linked role. When you register the first Amazon S3 path, the service-linked role and a new inline policy are created on your behalf. Lake Formation adds the first path to the inline policy and attaches it to the service-linked role. When you register subsequent paths, Lake Formation adds the path to the existing policy.</p>\n         <p>The following request registers a new location and gives Lake Formation permission to use the service-linked role to access that location.</p>\n         <p>\n            <code>ResourceArn = arn:aws:s3:::my-bucket\nUseServiceLinkedRole = true</code>\n         </p>\n         <p>If <code>UseServiceLinkedRole</code> is not set to true, you must provide or set the <code>RoleArn</code>:</p>\n         <p>\n            <code>arn:aws:iam::12345:role/my-data-access-role</code>\n         </p>",
+                "smithy.api#documentation": "<p>Registers the resource as managed by the Data Catalog.</p>\n         <p>To add or update data, Lake Formation needs read/write access to the chosen Amazon S3 path. Choose a role that you know has permission to do this, or choose the AWSServiceRoleForLakeFormationDataAccess service-linked role. When you register the first Amazon S3 path, the service-linked role and a new inline policy are created on your behalf. Lake Formation adds the first path to the inline policy and attaches it to the service-linked role. When you register subsequent paths, Lake Formation adds the path to the existing policy.</p>\n         <p>The following request registers a new location and gives Lake Formation permission to use the service-linked role to access that location.</p>\n         <p>\n            <code>ResourceArn = arn:aws:s3:::my-bucket/\nUseServiceLinkedRole = true</code>\n         </p>\n         <p>If <code>UseServiceLinkedRole</code> is not set to true, you must provide or set the <code>RoleArn</code>:</p>\n         <p>\n            <code>arn:aws:iam::12345:role/my-data-access-role</code>\n         </p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/RegisterResource",
@@ -6557,7 +6963,13 @@
                 "LFTagPolicy": {
                     "target": "com.amazonaws.lakeformation#LFTagPolicyResource",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of LF-tag conditions that define a resource's LF-tag policy.</p>"
+                        "smithy.api#documentation": "<p>A list of LF-tag conditions or saved LF-Tag expressions that define a resource's LF-tag policy.</p>"
+                    }
+                },
+                "LFTagExpression": {
+                    "target": "com.amazonaws.lakeformation#LFTagExpressionResource",
+                    "traits": {
+                        "smithy.api#documentation": "<p>LF-Tag expression resource. A logical expression composed of one or more LF-Tag key:value pairs.</p>"
                     }
                 }
             },
@@ -7765,6 +8177,84 @@
                 }
             }
         },
+        "com.amazonaws.lakeformation#UpdateLFTagExpression": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.lakeformation#UpdateLFTagExpressionRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.lakeformation#UpdateLFTagExpressionResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.lakeformation#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#EntityNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InternalServiceException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#InvalidInputException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#OperationTimeoutException"
+                },
+                {
+                    "target": "com.amazonaws.lakeformation#ResourceNumberLimitExceededException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Updates the name of the LF-Tag expression to the new description and expression body provided.\n      Updating a LF-Tag expression immediately changes the permission boundaries of all existing <code>LFTagPolicy</code> permission grants that reference the given LF-Tag expression.</p>",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/UpdateLFTagExpression",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.lakeformation#UpdateLFTagExpressionRequest": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "target": "com.amazonaws.lakeformation#NameString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name for the LF-Tag expression.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "Description": {
+                    "target": "com.amazonaws.lakeformation#DescriptionString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The description with information about the saved LF-Tag expression.</p>"
+                    }
+                },
+                "CatalogId": {
+                    "target": "com.amazonaws.lakeformation#CatalogIdString",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier for the Data Catalog. By default, the account ID. </p>"
+                    }
+                },
+                "Expression": {
+                    "target": "com.amazonaws.lakeformation#Expression",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The LF-Tag expression body composed of one more LF-Tag key-value pairs.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.lakeformation#UpdateLFTagExpressionResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.lakeformation#UpdateLFTagRequest": {
             "type": "structure",
             "members": {
@@ -8104,7 +8594,7 @@
                 "StorageOptimizerConfig": {
                     "target": "com.amazonaws.lakeformation#StorageOptimizerConfigMap",
                     "traits": {
-                        "smithy.api#documentation": "<p>Name of the table for which to enable the storage optimizer.</p>",
+                        "smithy.api#documentation": "<p>Name of the configuration for the storage optimizer.</p>",
                         "smithy.api#required": {}
                     }
                 }
diff --git a/codegen/sdk-codegen/aws-models/qapps.json b/codegen/sdk-codegen/aws-models/qapps.json
index 6d5be6904c1..b5af428cf64 100644
--- a/codegen/sdk-codegen/aws-models/qapps.json
+++ b/codegen/sdk-codegen/aws-models/qapps.json
@@ -180,7 +180,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Associates a rating or review for a library item with the user submitting \n      the request. This increments the rating count for the specified library item.</p>",
+                "smithy.api#documentation": "<p>Associates a rating or review for a library item with the user submitting\n      the request. This increments the rating count for the specified library item.</p>",
                 "smithy.api#examples": [
                     {
                         "title": "Increase the rating counter by 1 for the related app for this user",
@@ -364,6 +364,287 @@
                 "target": "com.amazonaws.qapps#AttributeFilter"
             }
         },
+        "com.amazonaws.qapps#BatchCreateCategory": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.qapps#BatchCreateCategoryInput"
+            },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.qapps#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ConflictException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#UnauthorizedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Creates Categories for the Amazon Q Business application environment instance. Web experience users use Categories to tag and filter library items. For more information, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/qapps-custom-labels.html\">Custom labels for Amazon Q Apps</a>.</p>",
+                "smithy.api#examples": [
+                    {
+                        "title": "Creates the categories for the library",
+                        "input": {
+                            "instanceId": "0b95c9c4-89cc-4aa8-9aae-aa91cbec699f",
+                            "categories": [
+                                {
+                                    "id": "549abfe0-f5c4-45a2-bb9b-c05987a49c6d",
+                                    "title": "HR"
+                                },
+                                {
+                                    "id": "18cbebaa-196a-4aa5-a840-88d548e07f8f",
+                                    "title": "Marketing"
+                                }
+                            ]
+                        }
+                    }
+                ],
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/catalog.createCategories"
+                }
+            }
+        },
+        "com.amazonaws.qapps#BatchCreateCategoryInput": {
+            "type": "structure",
+            "members": {
+                "instanceId": {
+                    "target": "com.amazonaws.qapps#InstanceId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier of the Amazon Q Business application environment instance.</p>",
+                        "smithy.api#httpHeader": "instance-id",
+                        "smithy.api#required": {}
+                    }
+                },
+                "categories": {
+                    "target": "com.amazonaws.qapps#BatchCreateCategoryInputCategoryList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of category objects to be created</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.qapps#BatchCreateCategoryInputCategory": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.qapps#UUID",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier to be associated with a category. If you don't include a value, the category is automatically assigned a unique identifier.</p>"
+                    }
+                },
+                "title": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the category.</p>",
+                        "smithy.api#length": {
+                            "min": 1,
+                            "max": 30
+                        },
+                        "smithy.api#pattern": "^[a-zA-Z0-9_]+( [a-zA-Z0-9_]+)*$",
+                        "smithy.api#required": {}
+                    }
+                },
+                "color": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The color to be associated with a category. The color must be a hexadecimal value of either 3 or 6 digits.</p>",
+                        "smithy.api#length": {
+                            "min": 4,
+                            "max": 7
+                        },
+                        "smithy.api#pattern": "^#([A-Fa-f0-9]{3}|[A-Fa-f0-9]{6})$"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>The category object to be created.</p>"
+            }
+        },
+        "com.amazonaws.qapps#BatchCreateCategoryInputCategoryList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.qapps#BatchCreateCategoryInputCategory"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "max": 10
+                }
+            }
+        },
+        "com.amazonaws.qapps#BatchDeleteCategory": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.qapps#BatchDeleteCategoryInput"
+            },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.qapps#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ConflictException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#UnauthorizedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Deletes Categories for the Amazon Q Business application environment instance. Web experience users use Categories to tag and filter library items. For more information, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/qapps-custom-labels.html\">Custom labels for Amazon Q Apps</a>.</p>",
+                "smithy.api#examples": [
+                    {
+                        "title": "Deletes the categories in the library",
+                        "input": {
+                            "instanceId": "0b95c9c4-89cc-4aa8-9aae-aa91cbec699f",
+                            "categories": [
+                                "9c871ed4-1c41-4065-aefe-321cd4b61cf8"
+                            ]
+                        }
+                    }
+                ],
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/catalog.deleteCategories"
+                }
+            }
+        },
+        "com.amazonaws.qapps#BatchDeleteCategoryInput": {
+            "type": "structure",
+            "members": {
+                "instanceId": {
+                    "target": "com.amazonaws.qapps#InstanceId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier of the Amazon Q Business application environment instance.</p>",
+                        "smithy.api#httpHeader": "instance-id",
+                        "smithy.api#required": {}
+                    }
+                },
+                "categories": {
+                    "target": "com.amazonaws.qapps#DeleteCategoryInputList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of IDs of the categories to be deleted.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.qapps#BatchUpdateCategory": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.qapps#BatchUpdateCategoryInput"
+            },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.qapps#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ConflictException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#UnauthorizedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Updates Categories for the Amazon Q Business application environment instance. Web experience users use Categories to tag and filter library items. For more information, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/qapps-custom-labels.html\">Custom labels for Amazon Q Apps</a>.</p>",
+                "smithy.api#examples": [
+                    {
+                        "title": "Updates the categories in the library",
+                        "input": {
+                            "instanceId": "0b95c9c4-89cc-4aa8-9aae-aa91cbec699f",
+                            "categories": [
+                                {
+                                    "id": "549abfe0-f5c4-45a2-bb9b-c05987a49c6d",
+                                    "title": "HR Management"
+                                },
+                                {
+                                    "id": "18cbebaa-196a-4aa5-a840-88d548e07f8f",
+                                    "title": "Sales"
+                                }
+                            ]
+                        }
+                    }
+                ],
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/catalog.updateCategories"
+                }
+            }
+        },
+        "com.amazonaws.qapps#BatchUpdateCategoryInput": {
+            "type": "structure",
+            "members": {
+                "instanceId": {
+                    "target": "com.amazonaws.qapps#InstanceId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier of the Amazon Q Business application environment instance.</p>",
+                        "smithy.api#httpHeader": "instance-id",
+                        "smithy.api#required": {}
+                    }
+                },
+                "categories": {
+                    "target": "com.amazonaws.qapps#CategoryListInput",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The list of categories to be updated with their new values.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
         "com.amazonaws.qapps#Card": {
             "type": "union",
             "members": {
@@ -563,6 +844,17 @@
                 }
             }
         },
+        "com.amazonaws.qapps#CategoriesList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.qapps#Category"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "max": 10
+                }
+            }
+        },
         "com.amazonaws.qapps#Category": {
             "type": "structure",
             "members": {
@@ -579,6 +871,18 @@
                         "smithy.api#documentation": "<p>The title or name of the category.</p>",
                         "smithy.api#required": {}
                     }
+                },
+                "color": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The color of the category</p>"
+                    }
+                },
+                "appCount": {
+                    "target": "smithy.api#Integer",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The number of published Amazon Q Apps associated with a category</p>"
+                    }
                 }
             },
             "traits": {
@@ -596,6 +900,44 @@
                 }
             }
         },
+        "com.amazonaws.qapps#CategoryInput": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "target": "com.amazonaws.qapps#UUID",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier of the category.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "title": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the category.</p>",
+                        "smithy.api#length": {
+                            "min": 1,
+                            "max": 30
+                        },
+                        "smithy.api#pattern": "^[a-zA-Z0-9_]+( [a-zA-Z0-9_]+)*$",
+                        "smithy.api#required": {}
+                    }
+                },
+                "color": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The color of the category, represented as a hexadecimal value of either 3 or 6 digits.</p>",
+                        "smithy.api#length": {
+                            "min": 4,
+                            "max": 7
+                        },
+                        "smithy.api#pattern": "^#([A-Fa-f0-9]{3}|[A-Fa-f0-9]{6})$"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>A label that web experience users associate with a library item. Web experience users use Categories to tag and filter library items.</p>"
+            }
+        },
         "com.amazonaws.qapps#CategoryList": {
             "type": "list",
             "member": {
@@ -607,6 +949,17 @@
                 }
             }
         },
+        "com.amazonaws.qapps#CategoryListInput": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.qapps#CategoryInput"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "max": 10
+                }
+            }
+        },
         "com.amazonaws.qapps#ConflictException": {
             "type": "structure",
             "members": {
@@ -632,7 +985,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The requested operation could not be completed due to a \n      conflict with the current state of the resource.</p>",
+                "smithy.api#documentation": "<p>The requested operation could not be completed due to a\n      conflict with the current state of the resource.</p>",
                 "smithy.api#error": "client",
                 "smithy.api#httpError": 409
             }
@@ -662,7 +1015,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The requested operation could not be completed because \n      the content exceeds the maximum allowed size.</p>",
+                "smithy.api#documentation": "<p>The requested operation could not be completed because\n      the content exceeds the maximum allowed size.</p>",
                 "smithy.api#error": "client",
                 "smithy.api#httpError": 413
             }
@@ -724,7 +1077,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Creates a new library item for an Amazon Q App, allowing it to be discovered and \n      used by other allowed users. </p>",
+                "smithy.api#documentation": "<p>Creates a new library item for an Amazon Q App, allowing it to be discovered and\n      used by other allowed users. </p>",
                 "smithy.api#examples": [
                     {
                         "title": "Create a Library Item",
@@ -1077,6 +1430,17 @@
                 }
             }
         },
+        "com.amazonaws.qapps#DeleteCategoryInputList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.qapps#UUID"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "max": 10
+                }
+            }
+        },
         "com.amazonaws.qapps#DeleteLibraryItem": {
             "type": "operation",
             "input": {
@@ -1109,7 +1473,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Deletes a library item for an Amazon Q App, removing it from the library \n      so it can no longer be discovered or used by other users.</p>",
+                "smithy.api#documentation": "<p>Deletes a library item for an Amazon Q App, removing it from the library\n      so it can no longer be discovered or used by other users.</p>",
                 "smithy.api#examples": [
                     {
                         "title": "Delete a library item",
@@ -1594,7 +1958,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Represents a file upload card. It can optionally \n      receive a <code>filename</code> and <code>fileId</code> to set a \n      default file.  If not received, the user must provide the file \n      when the Q App runs.</p>"
+                "smithy.api#documentation": "<p>Represents a file upload card. It can optionally\n      receive a <code>filename</code> and <code>fileId</code> to set a\n      default file.  If not received, the user must provide the file\n      when the Q App runs.</p>"
             }
         },
         "com.amazonaws.qapps#Filename": {
@@ -1634,7 +1998,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Retrieves details about a library item for an Amazon Q App, including its metadata, \n      categories, ratings, and usage statistics.</p>",
+                "smithy.api#documentation": "<p>Retrieves details about a library item for an Amazon Q App, including its metadata,\n      categories, ratings, and usage statistics.</p>",
                 "smithy.api#examples": [
                     {
                         "title": "Retrieve a library item",
@@ -2053,11 +2417,11 @@
                             "cardStatus": {
                                 "6fb5b404-3b7b-48a4-8a8b-56406922a606": {
                                     "currentState": "COMPLETED",
-                                    "currentValue": "What is the circumference of Earth?"
+                                    "currentValue": ""
                                 },
                                 "1e6caeac-b481-45ff-a082-8b9a4a0b72e8": {
                                     "currentState": "COMPLETED",
-                                    "currentValue": "Earth's circumference is 24,901 miles"
+                                    "currentValue": "Based on the responses, the most popular color is red, with 1 vote from the user \"user1\"."
                                 }
                             }
                         }
@@ -2165,7 +2529,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Uploads a file that can then be used either as a default in a \n      <code>FileUploadCard</code> from Q App definition or as a file that \n      is used inside a single Q App run. The purpose of the document is \n      determined by a scope parameter that indicates whether it is at the \n      app definition level or at the app session level.</p>",
+                "smithy.api#documentation": "<p>Uploads a file that can then be used either as a default in a\n      <code>FileUploadCard</code> from Q App definition or as a file that\n      is used inside a single Q App run. The purpose of the document is\n      determined by a scope parameter that indicates whether it is at the\n      app definition level or at the app session level.</p>",
                 "smithy.api#examples": [
                     {
                         "title": "Upload a file to a specific session",
@@ -2406,7 +2770,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>A library item is a snapshot of an Amazon Q App \n      that can be published so the users in their Amazon Q Apps library \n      can discover it, clone it, and run it.</p>"
+                "smithy.api#documentation": "<p>A library item is a snapshot of an Amazon Q App\n      that can be published so the users in their Amazon Q Apps library\n      can discover it, clone it, and run it.</p>"
             }
         },
         "com.amazonaws.qapps#LibraryItemStatus": {
@@ -2426,6 +2790,97 @@
                 }
             }
         },
+        "com.amazonaws.qapps#ListCategories": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.qapps#ListCategoriesInput"
+            },
+            "output": {
+                "target": "com.amazonaws.qapps#ListCategoriesOutput"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.qapps#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ThrottlingException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#UnauthorizedException"
+                },
+                {
+                    "target": "com.amazonaws.qapps#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Lists the categories of a Amazon Q Business application environment instance. For more information, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/qapps-custom-labels.html\">Custom labels for Amazon Q Apps</a>.</p>",
+                "smithy.api#examples": [
+                    {
+                        "title": "List categories available for the library items in this instance",
+                        "input": {
+                            "instanceId": "0b95c9c4-89cc-4aa8-9aae-aa91cbec699f"
+                        },
+                        "output": {
+                            "categories": [
+                                {
+                                    "id": "549abfe0-f5c4-45a2-bb9b-c05987a49c6d",
+                                    "title": "HR",
+                                    "color": "#FF6600",
+                                    "appCount": 10
+                                },
+                                {
+                                    "id": "18cbebaa-196a-4aa5-a840-88d548e07f8f",
+                                    "title": "Marketing",
+                                    "color": "#FFFF00",
+                                    "appCount": 11
+                                }
+                            ]
+                        }
+                    }
+                ],
+                "smithy.api#http": {
+                    "method": "GET",
+                    "uri": "/catalog.listCategories"
+                },
+                "smithy.api#readonly": {}
+            }
+        },
+        "com.amazonaws.qapps#ListCategoriesInput": {
+            "type": "structure",
+            "members": {
+                "instanceId": {
+                    "target": "com.amazonaws.qapps#InstanceId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The unique identifier of the Amazon Q Business application environment instance.</p>",
+                        "smithy.api#httpHeader": "instance-id",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.qapps#ListCategoriesOutput": {
+            "type": "structure",
+            "members": {
+                "categories": {
+                    "target": "com.amazonaws.qapps#CategoriesList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The categories of a Amazon Q Business application environment instance.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
         "com.amazonaws.qapps#ListLibraryItems": {
             "type": "operation",
             "input": {
@@ -2630,7 +3085,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Lists the Amazon Q Apps owned by or associated with the user either because \n      they created it or because they used it from the library in the past. The user \n      identity is extracted from the credentials used to invoke this operation..</p>",
+                "smithy.api#documentation": "<p>Lists the Amazon Q Apps owned by or associated with the user either because\n      they created it or because they used it from the library in the past. The user\n      identity is extracted from the credentials used to invoke this operation..</p>",
                 "smithy.api#examples": [
                     {
                         "title": "List at most 3 Amazon Q Apps in an Q Business application",
@@ -2968,7 +3423,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The definition of an Amazon Q App generated based on input such as a conversation \n      or problem statement.</p>"
+                "smithy.api#documentation": "<p>The definition of an Amazon Q App generated based on input such as a conversation\n      or problem statement.</p>"
             }
         },
         "com.amazonaws.qapps#PredictQApp": {
@@ -2997,7 +3452,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Generates an Amazon Q App definition based on either a conversation or \n      a problem statement provided as input.The resulting app definition\n      can be used to call <code>CreateQApp</code>. This API doesn't create \n      Amazon Q Apps directly.</p>",
+                "smithy.api#documentation": "<p>Generates an Amazon Q App definition based on either a conversation or\n      a problem statement provided as input.The resulting app definition\n      can be used to call <code>CreateQApp</code>. This API doesn't create\n      Amazon Q Apps directly.</p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/apps.predictQApp"
@@ -3096,6 +3551,15 @@
                 {
                     "target": "com.amazonaws.qapps#AssociateQAppWithUser"
                 },
+                {
+                    "target": "com.amazonaws.qapps#BatchCreateCategory"
+                },
+                {
+                    "target": "com.amazonaws.qapps#BatchDeleteCategory"
+                },
+                {
+                    "target": "com.amazonaws.qapps#BatchUpdateCategory"
+                },
                 {
                     "target": "com.amazonaws.qapps#CreateLibraryItem"
                 },
@@ -3126,6 +3590,9 @@
                 {
                     "target": "com.amazonaws.qapps#ImportDocument"
                 },
+                {
+                    "target": "com.amazonaws.qapps#ListCategories"
+                },
                 {
                     "target": "com.amazonaws.qapps#ListLibraryItems"
                 },
@@ -3173,7 +3640,7 @@
                     "name": "qapps"
                 },
                 "aws.protocols#restJson1": {},
-                "smithy.api#documentation": "<p>The Amazon Q Apps feature capability within Amazon Q Business allows web experience \n      users to create lightweight, purpose-built AI apps to fulfill specific tasks from \n      within their web experience. For example, users can create a Q App that exclusively \n      generates marketing-related content to improve your marketing team's productivity or a \n      Q App for writing customer emails and creating promotional content using a certain \n      style of voice, tone, and branding. For more information on the capabilities, see \n      <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/deploy-experience-iam-role.html#q-apps-actions\">Amazon Q Apps capabilities</a> in the <i>Amazon Q Business User Guide</i>. \n      </p>\n         <p>For an overview of the Amazon Q App APIs, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/api-reference/API_Operations_QApps.html\">Overview of \n      Amazon Q Apps API operations</a>.</p>\n         <p>For information about the IAM access control permissions you need to\n      use the Amazon Q Apps API, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/deploy-experience-iam-role.html\">\n        IAM role for the Amazon Q Business web experience including Amazon Q Apps</a> in the\n      <i>Amazon Q Business User Guide</i>.</p>",
+                "smithy.api#documentation": "<p>The Amazon Q Apps feature capability within Amazon Q Business allows web experience\n      users to create lightweight, purpose-built AI apps to fulfill specific tasks from\n      within their web experience. For example, users can create a Q App that exclusively\n      generates marketing-related content to improve your marketing team's productivity or a\n      Q App for writing customer emails and creating promotional content using a certain\n      style of voice, tone, and branding. For more information on the capabilities, see\n      <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/deploy-experience-iam-role.html#q-apps-actions\">Amazon Q Apps capabilities</a> in the <i>Amazon Q Business User Guide</i>.\n      </p>\n         <p>For an overview of the Amazon Q App APIs, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/api-reference/API_Operations_QApps.html\">Overview of\n      Amazon Q Apps API operations</a>.</p>\n         <p>For information about the IAM access control permissions you need to\n      use the Amazon Q Apps API, see <a href=\"https://docs.aws.amazon.com/amazonq/latest/qbusiness-ug/deploy-experience-iam-role.html\">\n        IAM role for the Amazon Q Business web experience including Amazon Q Apps</a> in the\n      <i>Amazon Q Business User Guide</i>.</p>",
                 "smithy.api#title": "QApps",
                 "smithy.rules#endpointRuleSet": {
                     "version": "1.0",
@@ -4001,7 +4468,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>A card in a Amazon Q App that generates a response \n      based on the Amazon Q Business service.</p>"
+                "smithy.api#documentation": "<p>A card in a Amazon Q App that generates a response\n      based on the Amazon Q Business service.</p>"
             }
         },
         "com.amazonaws.qapps#QQueryCardInput": {
@@ -4140,7 +4607,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The requested operation could not be completed because \n      it would exceed the service's quota or limit.</p>",
+                "smithy.api#documentation": "<p>The requested operation could not be completed because\n      it would exceed the service's quota or limit.</p>",
                 "smithy.api#error": "client",
                 "smithy.api#httpError": 402
             }
@@ -4177,7 +4644,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Starts a new session for an Amazon Q App, allowing inputs to be provided \n      and the app to be run.</p>\n         <note>\n            <p>Each Q App session will be condensed into a single conversation \n      in the web experience.</p>\n         </note>",
+                "smithy.api#documentation": "<p>Starts a new session for an Amazon Q App, allowing inputs to be provided\n      and the app to be run.</p>\n         <note>\n            <p>Each Q App session will be condensed into a single conversation\n      in the web experience.</p>\n         </note>",
                 "smithy.api#examples": [
                     {
                         "title": "Start a session for an Amazon Q App using version 1, passing in initial values for one card",
@@ -4300,7 +4767,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Stops an active session for an Amazon Q App.This deletes all data \n      related to the session and makes it invalid for future uses. The \n      results of the session will be persisted as part of the conversation.</p>",
+                "smithy.api#documentation": "<p>Stops an active session for an Amazon Q App.This deletes all data\n      related to the session and makes it invalid for future uses. The\n      results of the session will be persisted as part of the conversation.</p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/runtime.deleteMiniAppRun"
@@ -4582,7 +5049,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The requested operation could not be completed because too many \n      requests were sent at once. Wait a bit and try again later.</p>",
+                "smithy.api#documentation": "<p>The requested operation could not be completed because too many\n      requests were sent at once. Wait a bit and try again later.</p>",
                 "smithy.api#error": "client",
                 "smithy.api#httpError": 429,
                 "smithy.api#retryable": {
@@ -4605,7 +5072,7 @@
         "com.amazonaws.qapps#UUID": {
             "type": "string",
             "traits": {
-                "smithy.api#pattern": "^[\\da-f]{8}-[\\da-f]{4}-4[\\da-f]{3}-[89ABab][\\da-f]{3}-[\\da-f]{12}$"
+                "smithy.api#pattern": "^[\\da-f]{8}-[\\da-f]{4}-[45][\\da-f]{3}-[89ABab][\\da-f]{3}-[\\da-f]{12}$"
             }
         },
         "com.amazonaws.qapps#UnauthorizedException": {
@@ -5244,7 +5711,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Updates the session for a given Q App <code>sessionId</code>. This is only \n      valid when at least one card of the session is in the <code>WAITING</code> state. \n      Data for each <code>WAITING</code> card can be provided as input. If inputs \n      are not provided, the call will be accepted but session will not move forward. \n      Inputs for cards that are not in the <code>WAITING</code> status will be ignored.</p>",
+                "smithy.api#documentation": "<p>Updates the session for a given Q App <code>sessionId</code>. This is only\n      valid when at least one card of the session is in the <code>WAITING</code> state.\n      Data for each <code>WAITING</code> card can be provided as input. If inputs\n      are not provided, the call will be accepted but session will not move forward.\n      Inputs for cards that are not in the <code>WAITING</code> status will be ignored.</p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/runtime.updateQAppSession"
diff --git a/codegen/sdk-codegen/aws-models/s3-control.json b/codegen/sdk-codegen/aws-models/s3-control.json
index 3b8586d07b7..197ca7cdc86 100644
--- a/codegen/sdk-codegen/aws-models/s3-control.json
+++ b/codegen/sdk-codegen/aws-models/s3-control.json
@@ -6669,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 Servicesservices.</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 Services services.</p>\n         </note>"
                     }
                 },
                 "Bucket": {
@@ -10888,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 Servicesservices.</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 Services services.</p>\n         </note>"
                     }
                 },
                 "PublicAccessBlockConfiguration": {
@@ -14436,12 +14436,14 @@
                     "target": "com.amazonaws.s3control#StorageLensConfigurationList",
                     "traits": {
                         "smithy.api#documentation": "<p>A list of S3 Storage Lens configurations.</p>",
-                        "smithy.api#xmlFlattened": {}
+                        "smithy.api#xmlFlattened": {},
+                        "smithy.api#xmlName": "StorageLensConfiguration"
                     }
                 }
             },
             "traits": {
-                "smithy.api#output": {}
+                "smithy.api#output": {},
+                "smithy.api#xmlName": "ListStorageLensConfigurationResult"
             }
         },
         "com.amazonaws.s3control#ListStorageLensGroupEntry": {
@@ -14542,7 +14544,8 @@
                     "target": "com.amazonaws.s3control#StorageLensGroupList",
                     "traits": {
                         "smithy.api#documentation": "<p>\nThe list of Storage Lens groups that exist in the specified home Region.\n</p>",
-                        "smithy.api#xmlFlattened": {}
+                        "smithy.api#xmlFlattened": {},
+                        "smithy.api#xmlName": "StorageLensGroup"
                     }
                 }
             },
@@ -15732,7 +15735,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 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#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 Services 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#xmlName": "RestrictPublicBuckets"
                     }
                 }
diff --git a/codegen/sdk-codegen/aws-models/verifiedpermissions.json b/codegen/sdk-codegen/aws-models/verifiedpermissions.json
index 01f3eb95e57..b232e0bd31d 100644
--- a/codegen/sdk-codegen/aws-models/verifiedpermissions.json
+++ b/codegen/sdk-codegen/aws-models/verifiedpermissions.json
@@ -105,6 +105,18 @@
                     "traits": {
                         "smithy.api#documentation": "<p>An attribute value of <a href=\"https://docs.cedarpolicy.com/policies/syntax-datatypes.html#record\">Record</a>\n            type.</p>\n         <p>Example: <code>{\"record\": { \"keyName\": {} } }</code>\n         </p>"
                     }
+                },
+                "ipaddr": {
+                    "target": "com.amazonaws.verifiedpermissions#IpAddr",
+                    "traits": {
+                        "smithy.api#documentation": "<p>An attribute value of <a href=\"https://docs.cedarpolicy.com/policies/syntax-datatypes.html#datatype-ipaddr\">ipaddr</a> type.</p>\n         <p>Example: <code>{\"ip\": \"192.168.1.100\"}</code>\n         </p>"
+                    }
+                },
+                "decimal": {
+                    "target": "com.amazonaws.verifiedpermissions#Decimal",
+                    "traits": {
+                        "smithy.api#documentation": "<p>An attribute value of <a href=\"https://docs.cedarpolicy.com/policies/syntax-datatypes.html#datatype-decimal\">decimal</a> type.</p>\n         <p>Example: <code>{\"decimal\": \"1.1\"}</code>\n         </p>"
+                    }
                 }
             },
             "traits": {
@@ -132,6 +144,283 @@
                 }
             }
         },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicy": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyInput"
+            },
+            "output": {
+                "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyOutput"
+            },
+            "traits": {
+                "aws.iam#iamAction": {
+                    "documentation": "Grants permission to return a list of a requested policies stored in the specified policy stores",
+                    "name": "GetPolicy"
+                },
+                "smithy.api#documentation": "<p>Retrieves information about a group (batch) of policies.</p>\n         <note>\n            <p>The <code>BatchGetPolicy</code> operation doesn't have its own IAM\n                permission. To authorize this operation for Amazon Web Services principals, include the permission\n                <code>verifiedpermissions:GetPolicy</code> in their IAM policies.</p>\n         </note>",
+                "smithy.api#examples": [
+                    {
+                        "title": "To retrieve details about a policy",
+                        "documentation": "The following example retrieves information about the specified policy contained in the specified policy store. In this example, the requested policy is a template-linked policy, so it returns the ID of the policy template, and the specific principal and resource used by this policy.",
+                        "input": {
+                            "requests": [
+                                {
+                                    "policyId": "PWv5M6d5HePx3gVVLKY1nK",
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC"
+                                },
+                                {
+                                    "policyId": "LzFn6KgLWvv4Mbegus35jn",
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC"
+                                },
+                                {
+                                    "policyId": "77gLjer8H5o3mvrnMGrSL5",
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC"
+                                }
+                            ]
+                        },
+                        "output": {
+                            "results": [
+                                {
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC",
+                                    "policyId": "PWv5M6d5HePx3gVVLKY1nK",
+                                    "policyType": "STATIC",
+                                    "definition": {
+                                        "static": {
+                                            "description": "Users can manage account resources in any account they own",
+                                            "statement": "permit (principal, action in PhotoFlash::Action::\"ManageAccount\",resource) when { resource in principal.Account };"
+                                        }
+                                    },
+                                    "createdDate": "2024-10-18T18:53:39.258153Z",
+                                    "lastUpdatedDate": "2024-10-18T18:53:39.258153Z"
+                                },
+                                {
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC",
+                                    "policyId": "LzFn6KgLWvv4Mbegus35jn",
+                                    "policyType": "STATIC",
+                                    "definition": {
+                                        "static": {
+                                            "description": "User alice can't delete any photos.",
+                                            "statement": "forbid (principal == PhotoFlash::User::\"alice\", action in [PhotoFlash::Action::\"DeletePhoto\"], resource);"
+                                        }
+                                    },
+                                    "createdDate": "2024-10-18T18:57:03.305027Z",
+                                    "lastUpdatedDate": "2024-10-18T18:57:03.305027Z"
+                                },
+                                {
+                                    "policyStoreId": "ERZeDpRc34dkYZeb6FZRVC",
+                                    "policyId": "77gLjer8H5o3mvrnMGrSL5",
+                                    "policyType": "STATIC",
+                                    "definition": {
+                                        "static": {
+                                            "description": "User alice can view and delete photos.",
+                                            "statement": "permit (principal == PhotoFlash::User::\"alice\", action in [PhotoFlash::Action::\"DeletePhoto\", PhotoFlash::Action::\"ViewPhoto\"], resource);"
+                                        }
+                                    },
+                                    "createdDate": "2024-10-18T18:57:48.005343Z",
+                                    "lastUpdatedDate": "2024-10-18T18:57:48.005343Z"
+                                }
+                            ],
+                            "errors": []
+                        }
+                    }
+                ],
+                "smithy.api#readonly": {}
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorCode": {
+            "type": "enum",
+            "members": {
+                "POLICY_STORE_NOT_FOUND": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "POLICY_STORE_NOT_FOUND"
+                    }
+                },
+                "POLICY_NOT_FOUND": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "POLICY_NOT_FOUND"
+                    }
+                }
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorItem": {
+            "type": "structure",
+            "members": {
+                "code": {
+                    "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorCode",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The error code that was returned.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "policyStoreId": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy store associated with the failed request.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "policyId": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy associated with the failed request.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "message": {
+                    "target": "smithy.api#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A detailed error message.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains the information about an error resulting from a <code>BatchGetPolicy</code> API call.</p>"
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorItem"
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyInput": {
+            "type": "structure",
+            "members": {
+                "requests": {
+                    "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyInputList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>An array of up to 100 policies you want information about.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyInputItem": {
+            "type": "structure",
+            "members": {
+                "policyStoreId": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyStoreId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy store where the policy you want information about is stored.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "policyId": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy you want information about.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Information about a policy that you include in a <code>BatchGetPolicy</code> API request.</p>",
+                "smithy.api#references": [
+                    {
+                        "resource": "com.amazonaws.verifiedpermissions#PolicyStore"
+                    },
+                    {
+                        "resource": "com.amazonaws.verifiedpermissions#Policy"
+                    }
+                ]
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyInputList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyInputItem"
+            },
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 100
+                }
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyOutput": {
+            "type": "structure",
+            "members": {
+                "results": {
+                    "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyOutputList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Information about the policies listed in the request that were successfully returned. These results are returned in the order they were requested.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "errors": {
+                    "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyErrorList",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Information about the policies from the request that resulted in an error. These results are returned in the order they were requested.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyOutputItem": {
+            "type": "structure",
+            "members": {
+                "policyStoreId": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyStoreId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy store where the policy you want information about is stored.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "policyId": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The identifier of the policy you want information about.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "policyType": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The type of the policy. This is one of the following values:</p>\n         <ul>\n            <li>\n               <p>\n                  <code>STATIC</code>\n               </p>\n            </li>\n            <li>\n               <p>\n                  <code>TEMPLATE_LINKED</code>\n               </p>\n            </li>\n         </ul>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "definition": {
+                    "target": "com.amazonaws.verifiedpermissions#PolicyDefinitionDetail",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The policy definition of an item in the list of policies returned.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "createdDate": {
+                    "target": "com.amazonaws.verifiedpermissions#TimestampFormat",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The date and time the policy was created.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "lastUpdatedDate": {
+                    "target": "com.amazonaws.verifiedpermissions#TimestampFormat",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The date and time the policy was most recently updated.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains information about a policy returned from a <code>BatchGetPolicy</code> API request.</p>"
+            }
+        },
+        "com.amazonaws.verifiedpermissions#BatchGetPolicyOutputList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.verifiedpermissions#BatchGetPolicyOutputItem"
+            }
+        },
         "com.amazonaws.verifiedpermissions#BatchIsAuthorized": {
             "type": "operation",
             "input": {
@@ -388,7 +677,7 @@
                 "results": {
                     "target": "com.amazonaws.verifiedpermissions#BatchIsAuthorizedOutputList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A series of <code>Allow</code> or <code>Deny</code> decisions for each request, and\n            the policies that produced them.</p>",
+                        "smithy.api#documentation": "<p>A series of <code>Allow</code> or <code>Deny</code> decisions for each request, and\n            the policies that produced them. These results are returned in the order they were requested.</p>",
                         "smithy.api#required": {}
                     }
                 }
@@ -681,7 +970,7 @@
                 "results": {
                     "target": "com.amazonaws.verifiedpermissions#BatchIsAuthorizedWithTokenOutputList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A series of <code>Allow</code> or <code>Deny</code> decisions for each request, and\n            the policies that produced them.</p>",
+                        "smithy.api#documentation": "<p>A series of <code>Allow</code> or <code>Deny</code> decisions for each request, and\n            the policies that produced them.  These results are returned in the order they were requested.</p>",
                         "smithy.api#required": {}
                     }
                 }
@@ -1579,6 +1868,17 @@
                 "smithy.api#output": {}
             }
         },
+        "com.amazonaws.verifiedpermissions#Decimal": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 3,
+                    "max": 23
+                },
+                "smithy.api#pattern": "^-?\\d{1,15}\\.\\d{1,4}$",
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.verifiedpermissions#Decision": {
             "type": "enum",
             "members": {
@@ -2878,6 +3178,17 @@
                 "smithy.api#retryable": {}
             }
         },
+        "com.amazonaws.verifiedpermissions#IpAddr": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 44
+                },
+                "smithy.api#pattern": "^[0-9a-fA-F\\.:\\/]*$",
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.verifiedpermissions#IsAuthorized": {
             "type": "operation",
             "input": {
@@ -3720,7 +4031,6 @@
             "type": "string",
             "traits": {
                 "smithy.api#length": {
-                    "min": 1,
                     "max": 100
                 },
                 "smithy.api#pattern": "^.*$",
@@ -4272,7 +4582,7 @@
                 "policyStoreId": {
                     "target": "com.amazonaws.verifiedpermissions#PolicyStoreId",
                     "traits": {
-                        "smithy.api#documentation": "<p>The identifier of the PolicyStore where the policy you want information about is\n            stored.</p>",
+                        "smithy.api#documentation": "<p>The identifier of the policy store where the policy you want information about is\n            stored.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -4398,6 +4708,11 @@
                     "target": "com.amazonaws.verifiedpermissions#PutSchema"
                 }
             ],
+            "collectionOperations": [
+                {
+                    "target": "com.amazonaws.verifiedpermissions#BatchGetPolicy"
+                }
+            ],
             "resources": [
                 {
                     "target": "com.amazonaws.verifiedpermissions#IdentitySource"
@@ -4850,8 +5165,7 @@
             "type": "string",
             "traits": {
                 "smithy.api#length": {
-                    "min": 1,
-                    "max": 100000
+                    "min": 1
                 },
                 "smithy.api#sensitive": {}
             }