diff --git a/CHANGELOG.md b/CHANGELOG.md
index 354cd1ac212..731da41ba33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+# Release (2025-01-31)
+
+## General Highlights
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
+## Module Highlights
+* `github.com/aws/aws-sdk-go-v2`: v1.36.0
+  * **Feature**: Reduce allocations in query encoding.
+  * **Dependency Update**: Remove root dependency on go-jmespath, which is no longer used.
+* `github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue`: [v1.18.0](feature/dynamodb/attributevalue/CHANGELOG.md#v1180-2025-01-31)
+  * **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
+* `github.com/aws/aws-sdk-go-v2/feature/dynamodbstreams/attributevalue`: [v1.17.0](feature/dynamodbstreams/attributevalue/CHANGELOG.md#v1170-2025-01-31)
+  * **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
+* `github.com/aws/aws-sdk-go-v2/feature/s3/manager`: [v1.17.57](feature/s3/manager/CHANGELOG.md#v11757-2025-01-31)
+  * **Bug Fix**: Fix incorrect reference to old s3manager in comments.
+* `github.com/aws/aws-sdk-go-v2/service/amp`: [v1.31.0](service/amp/CHANGELOG.md#v1310-2025-01-31)
+  * **Feature**: Add support for sending metrics to cross account and CMCK AMP workspaces through RoleConfiguration on Create/Update Scraper.
+* `github.com/aws/aws-sdk-go-v2/service/bedrockagentruntime`: [v1.35.0](service/bedrockagentruntime/CHANGELOG.md#v1350-2025-01-31)
+  * **Feature**: This change is to deprecate the existing citation field under RetrieveAndGenerateStream API response in lieu of GeneratedResponsePart and RetrievedReferences
+* `github.com/aws/aws-sdk-go-v2/service/codebuild`: [v1.51.0](service/codebuild/CHANGELOG.md#v1510-2025-01-31)
+  * **Feature**: Added support for CodeBuild self-hosted Buildkite runner builds
+* `github.com/aws/aws-sdk-go-v2/service/georoutes`: [v1.1.0](service/georoutes/CHANGELOG.md#v110-2025-01-31)
+  * **Feature**: The OptimizeWaypoints API now supports 50 waypoints per request (20 with constraints like AccessHours or AppointmentTime). It adds waypoint clustering via Clustering and ClusteringIndex for better optimization. Also, total distance validation is removed for greater flexibility.
+* `github.com/aws/aws-sdk-go-v2/service/rds`: [v1.93.10](service/rds/CHANGELOG.md#v19310-2025-01-31)
+  * **Documentation**: Updates to Aurora MySQL and Aurora PostgreSQL API pages with instance log type in the create and modify DB Cluster.
+* `github.com/aws/aws-sdk-go-v2/service/sagemaker`: [v1.174.0](service/sagemaker/CHANGELOG.md#v11740-2025-01-31)
+  * **Feature**: This release introduces a new valid value in InstanceType parameter: p5en.48xlarge, in ProductionVariant.
+
 # Release (2025-01-30)
 
 ## General Highlights
diff --git a/SMITHY_GO_CODEGEN_VERSION b/SMITHY_GO_CODEGEN_VERSION
index 2964b066f5c..33eaada1115 100644
--- a/SMITHY_GO_CODEGEN_VERSION
+++ b/SMITHY_GO_CODEGEN_VERSION
@@ -1 +1 @@
-d708d1d4ae7dc9bc80ae20d1e09623fba519e9d7
+0681fa98ae3a2bd90161042c2c229a6cd4e9a80b
diff --git a/aws/go_module_metadata.go b/aws/go_module_metadata.go
index f46d637fbb1..512d8d8bae8 100644
--- a/aws/go_module_metadata.go
+++ b/aws/go_module_metadata.go
@@ -3,4 +3,4 @@
 package aws
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.35.0"
+const goModuleVersion = "1.36.0"
diff --git a/codegen/sdk-codegen/aws-models/amp.json b/codegen/sdk-codegen/aws-models/amp.json
index 6631ffdf1b8..ca1198b876d 100644
--- a/codegen/sdk-codegen/aws-models/amp.json
+++ b/codegen/sdk-codegen/aws-models/amp.json
@@ -1402,6 +1402,12 @@
                         "smithy.api#required": {}
                     }
                 },
+                "roleConfiguration": {
+                    "target": "com.amazonaws.amp#RoleConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The scraper role configuration for the workspace.</p>"
+                    }
+                },
                 "clientToken": {
                     "target": "com.amazonaws.amp#IdempotencyToken",
                     "traits": {
@@ -2552,7 +2558,8 @@
                 "aws.api#arnReference": {
                     "type": "AWS::IAM::Role"
                 },
-                "smithy.api#documentation": "<p>An ARN identifying an IAM role used by the scraper.</p>"
+                "smithy.api#documentation": "<p>An ARN identifying an IAM role used by the scraper.</p>",
+                "smithy.api#pattern": "^arn:aws[-a-z]*:iam::[0-9]{12}:role/.+$"
             }
         },
         "com.amazonaws.amp#IdempotencyToken": {
@@ -2602,7 +2609,7 @@
                     "min": 20,
                     "max": 2048
                 },
-                "smithy.api#pattern": "^arn:aws:kms:[a-z0-9\\-]+:\\d+:key/[a-f0-9\\-]+$"
+                "smithy.api#pattern": "^arn:aws[-a-z]*:kms:[-a-z0-9]+:[0-9]{12}:key/[-a-f0-9]+$"
             }
         },
         "com.amazonaws.amp#ListRuleGroupsNamespaces": {
@@ -3081,7 +3088,7 @@
                 "aws.api#arnReference": {
                     "type": "AWS::Logs::LogGroup"
                 },
-                "smithy.api#pattern": "^arn:aws[a-z0-9-]*:logs:[a-z0-9-]+:\\d{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*$"
+                "smithy.api#pattern": "^arn:aws[-a-z]*:logs:[-a-z0-9]+:[0-9]{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*$"
             }
         },
         "com.amazonaws.amp#LoggingConfiguration": {
@@ -3452,6 +3459,26 @@
                 "smithy.api#httpError": 404
             }
         },
+        "com.amazonaws.amp#RoleConfiguration": {
+            "type": "structure",
+            "members": {
+                "sourceRoleArn": {
+                    "target": "com.amazonaws.amp#IamRoleArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A ARN identifying the source role configuration.</p>"
+                    }
+                },
+                "targetRoleArn": {
+                    "target": "com.amazonaws.amp#IamRoleArn",
+                    "traits": {
+                        "smithy.api#documentation": "<p>A ARN identifying the target role configuration.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>To configure roles that allows users to write to an Amazon Managed Service for Prometheus workspace in a different account.</p>"
+            }
+        },
         "com.amazonaws.amp#RuleGroupsNamespace": {
             "type": "resource",
             "identifiers": {
@@ -3833,6 +3860,9 @@
                         "smithy.api#documentation": "<p>The Amazon Managed Service for Prometheus workspace the scraper sends metrics to.</p>",
                         "smithy.api#required": {}
                     }
+                },
+                "roleConfiguration": {
+                    "target": "com.amazonaws.amp#RoleConfiguration"
                 }
             },
             "traits": {
@@ -4011,6 +4041,9 @@
                         "smithy.api#documentation": "<p>The Amazon Managed Service for Prometheus workspace the scraper sends metrics to.</p>",
                         "smithy.api#required": {}
                     }
+                },
+                "roleConfiguration": {
+                    "target": "com.amazonaws.amp#RoleConfiguration"
                 }
             },
             "traits": {
@@ -4526,6 +4559,12 @@
                         "smithy.api#documentation": "<p>The new Amazon Managed Service for Prometheus workspace to send metrics to.</p>"
                     }
                 },
+                "roleConfiguration": {
+                    "target": "com.amazonaws.amp#RoleConfiguration",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The scraper role configuration for the workspace.</p>"
+                    }
+                },
                 "clientToken": {
                     "target": "com.amazonaws.amp#IdempotencyToken",
                     "traits": {
diff --git a/codegen/sdk-codegen/aws-models/bedrock-agent-runtime.json b/codegen/sdk-codegen/aws-models/bedrock-agent-runtime.json
index 6218426b589..ccb56530002 100644
--- a/codegen/sdk-codegen/aws-models/bedrock-agent-runtime.json
+++ b/codegen/sdk-codegen/aws-models/bedrock-agent-runtime.json
@@ -1567,8 +1567,24 @@
                 "citation": {
                     "target": "com.amazonaws.bedrockagentruntime#Citation",
                     "traits": {
+                        "smithy.api#deprecated": {
+                            "since": "2024-12-17",
+                            "message": "Citation is deprecated. Please use GeneratedResponsePart and RetrievedReferences for citation event."
+                        },
                         "smithy.api#documentation": "<p>The citation.</p>"
                     }
+                },
+                "generatedResponsePart": {
+                    "target": "com.amazonaws.bedrockagentruntime#GeneratedResponsePart",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The generated response to the citation event.</p>"
+                    }
+                },
+                "retrievedReferences": {
+                    "target": "com.amazonaws.bedrockagentruntime#RetrievedReferences",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The retrieved references of the citation event.</p>"
+                    }
                 }
             },
             "traits": {
diff --git a/codegen/sdk-codegen/aws-models/codebuild.json b/codegen/sdk-codegen/aws-models/codebuild.json
index b0c1b09d974..17df85fe63d 100644
--- a/codegen/sdk-codegen/aws-models/codebuild.json
+++ b/codegen/sdk-codegen/aws-models/codebuild.json
@@ -9415,6 +9415,12 @@
                     "traits": {
                         "smithy.api#enumValue": "BUILD_BATCH"
                     }
+                },
+                "RUNNER_BUILDKITE_BUILD": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "RUNNER_BUILDKITE_BUILD"
+                    }
                 }
             }
         },
@@ -9424,7 +9430,7 @@
                 "type": {
                     "target": "com.amazonaws.codebuild#WebhookFilterType",
                     "traits": {
-                        "smithy.api#documentation": "<p> The type of webhook filter. There are nine webhook filter types: <code>EVENT</code>,\n                <code>ACTOR_ACCOUNT_ID</code>, <code>HEAD_REF</code>, <code>BASE_REF</code>,\n            <code>FILE_PATH</code>, <code>COMMIT_MESSAGE</code>, <code>TAG_NAME</code>, <code>RELEASE_NAME</code>, \n            and <code>WORKFLOW_NAME</code>. </p>\n         <ul>\n            <li>\n               <p>\n                    EVENT\n                </p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the provided <code>pattern</code>\n                            matches one of nine event types: <code>PUSH</code>,\n                            <code>PULL_REQUEST_CREATED</code>, <code>PULL_REQUEST_UPDATED</code>, \n                            <code>PULL_REQUEST_CLOSED</code>, <code>PULL_REQUEST_REOPENED</code>, \n                            <code>PULL_REQUEST_MERGED</code>, <code>RELEASED</code>, <code>PRERELEASED</code>, \n                            and <code>WORKFLOW_JOB_QUEUED</code>. The <code>EVENT</code> patterns are\n                            specified as a comma-separated string. For example, <code>PUSH,\n                                PULL_REQUEST_CREATED, PULL_REQUEST_UPDATED</code> filters all push, pull\n                            request created, and pull request updated events. </p>\n                     <note>\n                        <p> Types <code>PULL_REQUEST_REOPENED</code> and <code>WORKFLOW_JOB_QUEUED</code> \n                                work with GitHub and GitHub Enterprise only. Types <code>RELEASED</code> and \n                                <code>PRERELEASED</code> work with GitHub only.</p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>ACTOR_ACCOUNT_ID</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when a GitHub, GitHub Enterprise, or\n                            Bitbucket account ID matches the regular expression <code>pattern</code>.\n                        </p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>HEAD_REF</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the head reference matches the\n                            regular expression <code>pattern</code>. For example,\n                            <code>refs/heads/branch-name</code> and <code>refs/tags/tag-name</code>. </p>\n                     <note>\n                        <p> Works with GitHub and GitHub Enterprise push, GitHub and GitHub\n                            Enterprise pull request, Bitbucket push, and Bitbucket pull request events.</p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>BASE_REF</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the base reference matches the\n                            regular expression <code>pattern</code>. For example,\n                            <code>refs/heads/branch-name</code>. </p>\n                     <note>\n                        <p> Works with pull request events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>FILE_PATH</p>\n               <ul>\n                  <li>\n                     <p> A webhook triggers a build when the path of a changed file matches the\n                            regular expression <code>pattern</code>. </p>\n                     <note>\n                        <p> Works with GitHub and Bitbucket events push and pull requests events.\n                                Also works with GitHub Enterprise push events, but does not work with\n                                GitHub Enterprise pull request events. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>COMMIT_MESSAGE</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the head commit message matches the\n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with GitHub and Bitbucket events push and pull requests events.\n                                Also works with GitHub Enterprise push events, but does not work with\n                                GitHub Enterprise pull request events. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>TAG_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the tag name of the release matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>RELEASED</code> and <code>PRERELEASED</code> events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>RELEASE_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the release name matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>RELEASED</code> and <code>PRERELEASED</code> events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>REPOSITORY_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the repository name matches the \n                                regular expression pattern.</p>\n                     <note>\n                        <p> Works with GitHub global or organization webhooks only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>WORKFLOW_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the workflow name matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>WORKFLOW_JOB_QUEUED</code> events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
+                        "smithy.api#documentation": "<p> The type of webhook filter. There are nine webhook filter types: <code>EVENT</code>,\n                <code>ACTOR_ACCOUNT_ID</code>, <code>HEAD_REF</code>, <code>BASE_REF</code>,\n            <code>FILE_PATH</code>, <code>COMMIT_MESSAGE</code>, <code>TAG_NAME</code>, <code>RELEASE_NAME</code>, \n            and <code>WORKFLOW_NAME</code>. </p>\n         <ul>\n            <li>\n               <p>\n                    EVENT\n                </p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the provided <code>pattern</code>\n                            matches one of nine event types: <code>PUSH</code>,\n                            <code>PULL_REQUEST_CREATED</code>, <code>PULL_REQUEST_UPDATED</code>, \n                            <code>PULL_REQUEST_CLOSED</code>, <code>PULL_REQUEST_REOPENED</code>, \n                            <code>PULL_REQUEST_MERGED</code>, <code>RELEASED</code>, <code>PRERELEASED</code>, \n                            and <code>WORKFLOW_JOB_QUEUED</code>. The <code>EVENT</code> patterns are\n                            specified as a comma-separated string. For example, <code>PUSH,\n                                PULL_REQUEST_CREATED, PULL_REQUEST_UPDATED</code> filters all push, pull\n                            request created, and pull request updated events. </p>\n                     <note>\n                        <p> Types <code>PULL_REQUEST_REOPENED</code> and <code>WORKFLOW_JOB_QUEUED</code> \n                                work with GitHub and GitHub Enterprise only. Types <code>RELEASED</code> and \n                                <code>PRERELEASED</code> work with GitHub only.</p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>ACTOR_ACCOUNT_ID</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when a GitHub, GitHub Enterprise, or\n                            Bitbucket account ID matches the regular expression <code>pattern</code>.\n                        </p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>HEAD_REF</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the head reference matches the\n                            regular expression <code>pattern</code>. For example,\n                            <code>refs/heads/branch-name</code> and <code>refs/tags/tag-name</code>. </p>\n                     <note>\n                        <p> Works with GitHub and GitHub Enterprise push, GitHub and GitHub\n                            Enterprise pull request, Bitbucket push, and Bitbucket pull request events.</p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>BASE_REF</p>\n               <ul>\n                  <li>\n                     <p> A webhook event triggers a build when the base reference matches the\n                            regular expression <code>pattern</code>. For example,\n                            <code>refs/heads/branch-name</code>. </p>\n                     <note>\n                        <p> Works with pull request events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>FILE_PATH</p>\n               <ul>\n                  <li>\n                     <p> A webhook triggers a build when the path of a changed file matches the\n                            regular expression <code>pattern</code>. </p>\n                     <note>\n                        <p> Works with GitHub and Bitbucket events push and pull requests events.\n                                Also works with GitHub Enterprise push events, but does not work with\n                                GitHub Enterprise pull request events. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>COMMIT_MESSAGE</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the head commit message matches the\n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with GitHub and Bitbucket events push and pull requests events.\n                                Also works with GitHub Enterprise push events, but does not work with\n                                GitHub Enterprise pull request events. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>TAG_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the tag name of the release matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>RELEASED</code> and <code>PRERELEASED</code> events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>RELEASE_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the release name matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>RELEASED</code> and <code>PRERELEASED</code> events only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>REPOSITORY_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the repository name matches the \n                                regular expression pattern.</p>\n                     <note>\n                        <p> Works with GitHub global or organization webhooks only. </p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>WORKFLOW_NAME</p>\n               <ul>\n                  <li>\n                     <p>A webhook triggers a build when the workflow name matches the \n                            regular expression <code>pattern</code>.</p>\n                     <note>\n                        <p> Works with <code>WORKFLOW_JOB_QUEUED</code> events only. </p>\n                     </note>\n                     <note>\n                        <p>For CodeBuild-hosted Buildkite runner builds, WORKFLOW_NAME\n                                filters will filter by pipeline name.</p>\n                     </note>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
                         "smithy.api#required": {}
                     }
                 },
@@ -9443,7 +9449,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p> A filter used to determine which webhooks trigger a build. </p>"
+                "smithy.api#documentation": "<p>A filter used to determine which webhooks trigger a build. </p>"
             }
         },
         "com.amazonaws.codebuild#WebhookFilterType": {
diff --git a/codegen/sdk-codegen/aws-models/geo-routes.json b/codegen/sdk-codegen/aws-models/geo-routes.json
index aa9c2cf304e..54445b7382f 100644
--- a/codegen/sdk-codegen/aws-models/geo-routes.json
+++ b/codegen/sdk-codegen/aws-models/geo-routes.json
@@ -113,19 +113,19 @@
                 "Allow": {
                     "target": "com.amazonaws.georoutes#IsolineAllowOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are allowed while calculating. a route</p>"
+                        "smithy.api#documentation": "<p>Features that are allowed while calculating an isoline.</p>"
                     }
                 },
                 "ArrivalTime": {
                     "target": "com.amazonaws.georoutes#TimestampWithTimezoneOffset",
                     "traits": {
-                        "smithy.api#documentation": "<p>Time of arrival at the destination.</p>\n         <p>Time format: <code>YYYY-MM-DDThh:mm:ss.sssZ | YYYY-MM-DDThh:mm:ss.sss+hh:mm</code>\n         </p>\n         <p>Examples:</p>\n         <p>\n            <code>2020-04-22T17:57:24Z</code>\n         </p>\n         <p>\n            <code>2020-04-22T17:57:24+02:00</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Time of arrival at the destination.</p>\n         <p>Time format: <code>YYYY-MM-DDThh:mm:ss.sssZ |\n         YYYY-MM-DDThh:mm:ss.sss+hh:mm</code>\n         </p>\n         <p>Examples:</p>\n         <p>\n            <code>2020-04-22T17:57:24Z</code>\n         </p>\n         <p>\n            <code>2020-04-22T17:57:24+02:00</code>\n         </p>"
                     }
                 },
                 "Avoid": {
                     "target": "com.amazonaws.georoutes#IsolineAvoidanceOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis. If an\n         avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
+                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis.\n         If an avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
                     }
                 },
                 "DepartNow": {
@@ -143,7 +143,7 @@
                 "Destination": {
                     "target": "com.amazonaws.georoutes#Position",
                     "traits": {
-                        "smithy.api#documentation": "<p>The final position for the route. In the World Geodetic System (WGS 84) format: <code>[longitude, latitude]</code>.</p>"
+                        "smithy.api#documentation": "<p>The final position for the route. In the World Geodetic System (WGS 84) format:\n            <code>[longitude, latitude]</code>.</p>"
                     }
                 },
                 "DestinationOptions": {
@@ -161,7 +161,7 @@
                 "IsolineGranularity": {
                     "target": "com.amazonaws.georoutes#IsolineGranularityOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Defines the granularity of the returned Isoline</p>"
+                        "smithy.api#documentation": "<p>Defines the granularity of the returned Isoline.</p>"
                     }
                 },
                 "Key": {
@@ -174,7 +174,7 @@
                 "OptimizeIsolineFor": {
                     "target": "com.amazonaws.georoutes#IsolineOptimizationObjective",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the optimization criteria for when calculating an isoline. AccurateCalculation generates an isoline of higher granularity that is more precise.  \nFastCalculation generates an isoline faster by reducing the granularity, and in turn the quality of the isoline. BalancedCalculation generates an isoline by balancing between quality and performance. \n</p>\n         <p>Default Value: <code>BalancedCalculation</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the optimization criteria for when calculating an isoline. AccurateCalculation\n         generates an isoline of higher granularity that is more precise. FastCalculation generates\n         an isoline faster by reducing the granularity, and in turn the quality of the isoline.\n         BalancedCalculation generates an isoline by balancing between quality and performance. </p>\n         <p>Default Value: <code>BalancedCalculation</code>\n         </p>"
                     }
                 },
                 "OptimizeRoutingFor": {
@@ -198,7 +198,7 @@
                 "Thresholds": {
                     "target": "com.amazonaws.georoutes#IsolineThresholds",
                     "traits": {
-                        "smithy.api#documentation": "<p>Threshold to be used for the isoline calculation. Up to \n      3 thresholds per provided type can be requested.</p>",
+                        "smithy.api#documentation": "<p>Threshold to be used for the isoline calculation. Up to 3 thresholds per provided type\n         can be requested.</p>\n         <p> You incur a calculation charge for each threshold. Using a large amount of thresholds in a\n          request can lead you to incur unexpected charges. See\n          <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`\">\n              Amazon Location's pricing page</a> for more information.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -211,7 +211,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#IsolineTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <note>\n            <p> The mode <code>Scooter</code> also applies to motorcycles, set to <code>Scooter</code> when wanted to calculate options for motorcycles.</p>\n         </note>\n         <p>Default Value: <code>Car</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <note>\n            <p> The mode <code>Scooter</code> also applies to motorcycles, set to\n               <code>Scooter</code> when wanted to calculate options for motorcycles.</p>\n         </note>\n         <p>Default Value: <code>Car</code>\n         </p>"
                     }
                 },
                 "TravelModeOptions": {
@@ -231,7 +231,7 @@
                 "ArrivalTime": {
                     "target": "com.amazonaws.georoutes#TimestampWithTimezoneOffset",
                     "traits": {
-                        "smithy.api#documentation": "<p>Time of arrival at the destination. This parameter is returned only if the Destination parameters was provided in the request.  </p>\n         <p>Time format:<code>YYYY-MM-DDThh:mm:ss.sssZ | YYYY-MM-DDThh:mm:ss.sss+hh:mm</code>\n         </p>\n         <p>Examples:</p>\n         <p>\n            <code>2020-04-22T17:57:24Z</code>\n         </p>\n         <p>\n            <code>2020-04-22T17:57:24+02:00</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Time of arrival at the destination. This parameter is returned only if the Destination\n         parameters was provided in the request. </p>\n         <p>Time format:<code>YYYY-MM-DDThh:mm:ss.sssZ | YYYY-MM-DDThh:mm:ss.sss+hh:mm</code>\n         </p>\n         <p>Examples:</p>\n         <p>\n            <code>2020-04-22T17:57:24Z</code>\n         </p>\n         <p>\n            <code>2020-04-22T17:57:24+02:00</code>\n         </p>"
                     }
                 },
                 "DepartureTime": {
@@ -303,7 +303,7 @@
             ],
             "traits": {
                 "aws.api#dataPlane": {},
-                "smithy.api#documentation": "<p>Calculates route matrix containing the results for all pairs of \n      Origins to Destinations. Each row corresponds to one entry in Origins. \n      Each entry in the row corresponds to the route from that entry in Origins to an entry in Destinations positions.</p>",
+                "smithy.api#documentation": "<p> Use <code>CalculateRouteMatrix</code> to compute results for all pairs of Origins to\n         Destinations. Each row corresponds to one entry in Origins. Each entry in the row\n         corresponds to the route from that entry in Origins to an entry in Destinations\n         positions.</p>",
                 "smithy.api#http": {
                     "uri": "/route-matrix",
                     "method": "POST"
@@ -350,13 +350,13 @@
                 "Allow": {
                     "target": "com.amazonaws.georoutes#RouteMatrixAllowOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are allowed while calculating. a route</p>"
+                        "smithy.api#documentation": "<p>Features that are allowed while calculating a route.</p>"
                     }
                 },
                 "Avoid": {
                     "target": "com.amazonaws.georoutes#RouteMatrixAvoidanceOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis. If an\n         avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
+                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis.\n         If an avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
                     }
                 },
                 "DepartNow": {
@@ -374,7 +374,7 @@
                 "Destinations": {
                     "target": "com.amazonaws.georoutes#RouteMatrixDestinationList",
                     "traits": {
-                        "smithy.api#documentation": "<p>List of destinations for the route.</p>",
+                        "smithy.api#documentation": "<p>List of destinations for the route.</p>\n         <note>\n            <p>Route calculations are billed for each origin and destination pair. If you use a large matrix of origins and destinations, your costs will increase accordingly. See\n            <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`\">\n                Amazon Location's pricing page</a> for more information.</p>\n         </note>",
                         "smithy.api#length": {
                             "min": 1
                         },
@@ -403,7 +403,7 @@
                 "Origins": {
                     "target": "com.amazonaws.georoutes#RouteMatrixOriginList",
                     "traits": {
-                        "smithy.api#documentation": "<p>The position in longitude and latitude for the origin.</p>",
+                        "smithy.api#documentation": "<p>The position in longitude and latitude for the origin.</p>\n         <note>\n            <p>Route calculations are billed for each origin and destination pair. Using a large amount of Origins in a\n            request can lead you to incur unexpected charges. See\n            <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`\">\n                Amazon Location's pricing page</a> for more information.</p>\n         </note>",
                         "smithy.api#length": {
                             "min": 1
                         },
@@ -413,7 +413,7 @@
                 "RoutingBoundary": {
                     "target": "com.amazonaws.georoutes#RouteMatrixBoundary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. \n      All data, origins and destinations outside the boundary are considered invalid.</p>\n         <note>\n            <p>When request routing boundary was set as AutoCircle, the response routing boundary will return Circle derived from the AutoCircle settings.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. All data, origins and destinations\n         outside the boundary are considered invalid.</p>\n         <note>\n            <p>When request routing boundary was set as AutoCircle, the response routing boundary\n            will return Circle derived from the AutoCircle settings.</p>\n         </note>",
                         "smithy.api#required": {}
                     }
                 },
@@ -426,7 +426,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#RouteMatrixTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
                     }
                 },
                 "TravelModeOptions": {
@@ -446,7 +446,7 @@
                 "ErrorCount": {
                     "target": "smithy.api#Integer",
                     "traits": {
-                        "smithy.api#documentation": "<p>The count of error results in the route matrix. If this number is 0, all routes were calculated successfully.</p>",
+                        "smithy.api#documentation": "<p>The count of error results in the route matrix. If this number is 0, all routes were\n         calculated successfully.</p>",
                         "smithy.api#range": {
                             "min": 0
                         },
@@ -464,14 +464,14 @@
                 "RouteMatrix": {
                     "target": "com.amazonaws.georoutes#RouteMatrix",
                     "traits": {
-                        "smithy.api#documentation": "<p>The calculated route matrix containing the results for all pairs of Origins to Destination positions. Each row corresponds to one entry in Origins. Each entry in the row corresponds to the route from that entry in Origins to an entry in Destination positions.</p>",
+                        "smithy.api#documentation": "<p>The calculated route matrix containing the results for all pairs of Origins to\n         Destination positions. Each row corresponds to one entry in Origins. Each entry in the row\n         corresponds to the route from that entry in Origins to an entry in Destination\n         positions.</p>",
                         "smithy.api#required": {}
                     }
                 },
                 "RoutingBoundary": {
                     "target": "com.amazonaws.georoutes#RouteMatrixBoundary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. All data, origins and destinations outside the boundary are considered invalid.</p>\n         <note>\n            <p>When request routing boundary was set as AutoCircle, the response routing boundary will return Circle derived from the AutoCircle settings.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. All data, origins and destinations\n         outside the boundary are considered invalid.</p>\n         <note>\n            <p>When request routing boundary was set as AutoCircle, the response routing boundary\n            will return Circle derived from the AutoCircle settings.</p>\n         </note>",
                         "smithy.api#required": {}
                     }
                 }
@@ -504,7 +504,7 @@
             ],
             "traits": {
                 "aws.api#dataPlane": {},
-                "smithy.api#documentation": "<p>Calculates a route given the following required parameters: \n      <code>Origin</code> and <code>Destination</code>.</p>",
+                "smithy.api#documentation": "<p>\n            <code>CalculateRoutes</code> computes routes given the following required parameters:\n            <code>Origin</code> and <code>Destination</code>.</p>",
                 "smithy.api#http": {
                     "uri": "/routes",
                     "method": "POST"
@@ -540,7 +540,7 @@
                 "Allow": {
                     "target": "com.amazonaws.georoutes#RouteAllowOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are allowed while calculating. a route</p>"
+                        "smithy.api#documentation": "<p>Features that are allowed while calculating a route.</p>"
                     }
                 },
                 "ArrivalTime": {
@@ -552,7 +552,7 @@
                 "Avoid": {
                     "target": "com.amazonaws.georoutes#RouteAvoidanceOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis. If an\n         avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
+                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis.\n         If an avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
                     }
                 },
                 "DepartNow": {
@@ -570,7 +570,7 @@
                 "Destination": {
                     "target": "com.amazonaws.georoutes#Position",
                     "traits": {
-                        "smithy.api#documentation": "<p>The final position for the route. In the World Geodetic System (WGS 84) format: <code>[longitude, latitude]</code>.</p>",
+                        "smithy.api#documentation": "<p>The final position for the route. In the World Geodetic System (WGS 84) format:\n            <code>[longitude, latitude]</code>.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -608,7 +608,7 @@
                 "Languages": {
                     "target": "com.amazonaws.georoutes#LanguageTagList",
                     "traits": {
-                        "smithy.api#documentation": "<p>List of languages for instructions within steps in the response.</p>\n         <note>\n            <p>Instructions in the requested language are returned only if they are available.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>List of languages for instructions within steps in the response.</p>\n         <note>\n            <p>Instructions in the requested language are returned only if they are\n            available.</p>\n         </note>",
                         "smithy.api#length": {
                             "max": 10
                         }
@@ -617,19 +617,19 @@
                 "LegAdditionalFeatures": {
                     "target": "com.amazonaws.georoutes#RouteLegAdditionalFeatureList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of optional additional parameters such as timezone that can be requested for each result.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>Elevation</code>: Retrieves the elevation information for each location.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Incidents</code>: Provides information on traffic incidents along the route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>PassThroughWaypoints</code>: Indicates waypoints that are passed through without stopping.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Summary</code>: Returns a summary of the route, including distance and duration.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Tolls</code>: Supplies toll cost information along the route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TravelStepInstructions</code>: Provides step-by-step instructions for travel along the route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TruckRoadTypes</code>: Returns information about road types suitable for trucks.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TypicalDuration</code>: Gives typical travel duration based on historical data.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Zones</code>: Specifies the time zone information for each waypoint.</p>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>A list of optional additional parameters such as timezone that can be requested for each\n         result.</p>\n         <ul>\n            <li>\n               <p>\n                  <code>Elevation</code>: Retrieves the elevation information for each\n               location.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Incidents</code>: Provides information on traffic incidents along the\n               route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>PassThroughWaypoints</code>: Indicates waypoints that are passed through\n               without stopping.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Summary</code>: Returns a summary of the route, including distance and\n               duration.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Tolls</code>: Supplies toll cost information along the route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TravelStepInstructions</code>: Provides step-by-step instructions for travel\n               along the route.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TruckRoadTypes</code>: Returns information about road types suitable for\n               trucks.</p>\n            </li>\n            <li>\n               <p>\n                  <code>TypicalDuration</code>: Gives typical travel duration based on historical\n               data.</p>\n            </li>\n            <li>\n               <p>\n                  <code>Zones</code>: Specifies the time zone information for each waypoint.</p>\n            </li>\n         </ul>"
                     }
                 },
                 "LegGeometryFormat": {
                     "target": "com.amazonaws.georoutes#GeometryFormat",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the format of the geometry returned for each leg of the route. You can \n      choose between two different geometry encoding formats.</p>\n         <p>\n            <code>FlexiblePolyline</code>: A compact and precise encoding format for the \n    leg geometry. For more information on the format, see the GitHub repository for  <a href=\"https://github.com/heremaps/flexible-polyline\">\n               <code>FlexiblePolyline</code>\n            </a>.</p>\n         <p>\n            <code>Simple</code>: A less compact encoding,\n     which is easier to decode but may be less precise and result in larger payloads.</p>"
+                        "smithy.api#documentation": "<p>Specifies the format of the geometry returned for each leg of the route. You can choose\n         between two different geometry encoding formats.</p>\n         <p>\n            <code>FlexiblePolyline</code>: A compact and precise encoding format for the leg\n         geometry. For more information on the format, see the GitHub repository for <a href=\"https://github.com/heremaps/flexible-polyline\">\n               <code>FlexiblePolyline</code>\n            </a>.</p>\n         <p>\n            <code>Simple</code>: A less compact encoding, which is easier to decode but may be less\n         precise and result in larger payloads.</p>"
                     }
                 },
                 "MaxAlternatives": {
                     "target": "smithy.api#Integer",
                     "traits": {
-                        "smithy.api#documentation": "<p>Maximum number of alternative routes to be provided in the response, if available.</p>",
+                        "smithy.api#documentation": "<p>Maximum number of alternative routes to be provided in the response, if\n         available.</p>",
                         "smithy.api#range": {
                             "min": 0,
                             "max": 5
@@ -658,7 +658,7 @@
                 "SpanAdditionalFeatures": {
                     "target": "com.amazonaws.georoutes#RouteSpanAdditionalFeatureList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of optional features such as SpeedLimit that can be requested for a Span. A span is a section of a Leg for which the requested features have the same values.</p>"
+                        "smithy.api#documentation": "<p>A list of optional features such as SpeedLimit that can be requested for a Span. A span\n         is a section of a Leg for which the requested features have the same values.</p>"
                     }
                 },
                 "Tolls": {
@@ -676,7 +676,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#RouteTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
                     }
                 },
                 "TravelModeOptions": {
@@ -688,7 +688,7 @@
                 "TravelStepType": {
                     "target": "com.amazonaws.georoutes#RouteTravelStepType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Type of step returned by the response.\nDefault provides basic steps intended for web based applications.\nTurnByTurn provides detailed instructions with more granularity intended for a turn based naviagtion system.</p>"
+                        "smithy.api#documentation": "<p>Type of step returned by the response. Default provides basic steps intended for web\n         based applications. TurnByTurn provides detailed instructions with more granularity\n         intended for a turn based navigation system.</p>"
                     }
                 },
                 "Waypoints": {
@@ -715,7 +715,7 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#RouteResponseNoticeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>",
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -745,7 +745,7 @@
                 "Center": {
                     "target": "com.amazonaws.georoutes#Position",
                     "traits": {
-                        "smithy.api#documentation": "<p>Center of the Circle defined in longitude and latitude coordinates.</p>\n         <p>Example: <code>[-123.1174, 49.2847]</code> represents the position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>. </p>",
+                        "smithy.api#documentation": "<p>Center of the Circle defined in longitude and latitude coordinates.</p>\n         <p>Example: <code>[-123.1174, 49.2847]</code> represents the position with longitude\n            <code>-123.1174</code> and latitude <code>49.2847</code>. </p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -758,10 +758,18 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Geometry defined as a circle. When request routing boundary was set as <code>AutoCircle</code>, the response routing boundary will return <code>Circle</code> derived from the <code>AutoCircle</code> settings.</p>",
+                "smithy.api#documentation": "<p>Geometry defined as a circle. When request routing boundary was set as\n            <code>AutoCircle</code>, the response routing boundary will return <code>Circle</code>\n         derived from the <code>AutoCircle</code> settings.</p>",
                 "smithy.api#sensitive": {}
             }
         },
+        "com.amazonaws.georoutes#ClusterIndex": {
+            "type": "integer",
+            "traits": {
+                "smithy.api#range": {
+                    "min": 0
+                }
+            }
+        },
         "com.amazonaws.georoutes#Corridor": {
             "type": "structure",
             "members": {
@@ -781,7 +789,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of the corridor.</p>",
+                "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of\n         the corridor.</p>",
                 "smithy.api#sensitive": {}
             }
         },
@@ -954,7 +962,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The request processing has failed because of an unknown error, exception or failure.</p>",
+                "smithy.api#documentation": "<p>The request processing has failed because of an unknown error, exception or\n         failure.</p>",
                 "smithy.api#error": "server",
                 "smithy.api#httpError": 500,
                 "smithy.api#retryable": {}
@@ -966,7 +974,7 @@
                 "Connections": {
                     "target": "com.amazonaws.georoutes#IsolineConnectionList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Isolines may contain multiple components, if these components are connected by ferry links. These components are returned as separate polygons while the ferry links are returned as connections.</p>",
+                        "smithy.api#documentation": "<p>Isolines may contain multiple components, if these components are connected by ferry\n         links. These components are returned as separate polygons while the ferry links are\n         returned as connections.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -1002,18 +1010,18 @@
                 "Hot": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating an isoline.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 },
                 "Hov": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating an isoline.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Features that are allowed while calculating. a route</p>"
+                "smithy.api#documentation": "<p>Features that are allowed while calculating an isoline.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineAvoidanceArea": {
@@ -1022,7 +1030,7 @@
                 "Except": {
                     "target": "com.amazonaws.georoutes#IsolineAvoidanceAreaGeometryList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Exceptions to the provided avoidance geometry, to be included while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Exceptions to the provided avoidance geometry, to be included while calculating an\n         isoline.</p>"
                     }
                 },
                 "Geometry": {
@@ -1049,13 +1057,13 @@
                 "Corridor": {
                     "target": "com.amazonaws.georoutes#Corridor",
                     "traits": {
-                        "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of the corridor.</p>"
+                        "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of\n         the corridor.</p>"
                     }
                 },
                 "Polygon": {
                     "target": "com.amazonaws.georoutes#LinearRings",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of Polygon will be excluded for calculating isolines, the list can only contain 1 polygon.</p>",
+                        "smithy.api#documentation": "<p>A list of Polygon will be excluded for calculating isolines, the list can only contain 1\n         polygon.</p>",
                         "smithy.api#length": {
                             "min": 1,
                             "max": 1
@@ -1065,13 +1073,13 @@
                 "PolylineCorridor": {
                     "target": "com.amazonaws.georoutes#PolylineCorridor",
                     "traits": {
-                        "smithy.api#documentation": "<p>Geometry defined as an encoded corridor – a polyline with a radius that defines the width of the corridor. For more information on polyline \nencoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>"
+                        "smithy.api#documentation": "<p>Geometry defined as an encoded corridor – a polyline with a radius that defines the\n         width of the corridor. For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>"
                     }
                 },
                 "PolylinePolygon": {
                     "target": "com.amazonaws.georoutes#PolylineRingList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of PolylinePolygon's that are excluded for calculating isolines, the list can only contain 1 polygon. For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.  \n</p>",
+                        "smithy.api#documentation": "<p>A list of PolylinePolygon's that are excluded for calculating isolines, the list can\n         only contain 1 polygon. For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>. </p>",
                         "smithy.api#length": {
                             "min": 1,
                             "max": 1
@@ -1080,7 +1088,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The  avoidance geometry, to be included while calculating the route.</p>"
+                "smithy.api#documentation": "<p>The avoidance geometry, to be included while calculating an isoline.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineAvoidanceAreaGeometryList": {
@@ -1107,31 +1115,31 @@
                 "CarShuttleTrains": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid car-shuttle-trains while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid car-shuttle-trains while calculating an isoline.</p>"
                     }
                 },
                 "ControlledAccessHighways": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid controlled access highways while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid controlled access highways while calculating an isoline.</p>"
                     }
                 },
                 "DirtRoads": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid dirt roads while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid dirt roads while calculating an isoline.</p>"
                     }
                 },
                 "Ferries": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid ferries while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid ferries while calculating an isoline.</p>"
                     }
                 },
                 "SeasonalClosure": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid roads that have seasonal closure while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid roads that have seasonal closure while calculating an isoline.</p>"
                     }
                 },
                 "TollRoads": {
@@ -1149,13 +1157,13 @@
                 "TruckRoadTypes": {
                     "target": "com.amazonaws.georoutes#TruckRoadTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n<code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
                     }
                 },
                 "Tunnels": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Avoid tunnels while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Avoid tunnels while calculating an isoline.</p>"
                     }
                 },
                 "UTurns": {
@@ -1172,7 +1180,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis. If an\n         avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
+                "smithy.api#documentation": "<p>Features that are avoided while calculating isolines. Avoidance is on a best-case basis.\n         If an avoidance can't be satisfied for a particular case, it violates the avoidance and the\n         returned response produces a notice for the violation.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineAvoidanceZoneCategory": {
@@ -1239,7 +1247,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options for vehicles.</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Car</code>.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineConnection": {
@@ -1248,7 +1256,7 @@
                 "FromPolygonIndex": {
                     "target": "smithy.api#Integer",
                     "traits": {
-                        "smithy.api#documentation": "<p>Index of the polygon corresponding to the \"from\" component of the connection. The polygon is available from <code>Isoline[].Geometries</code>.</p>",
+                        "smithy.api#documentation": "<p>Index of the polygon corresponding to the \"from\" component of the connection.\n         The polygon is available from <code>Isoline[].Geometries</code>.</p>",
                         "smithy.api#range": {
                             "min": 0
                         },
@@ -1265,7 +1273,7 @@
                 "ToPolygonIndex": {
                     "target": "smithy.api#Integer",
                     "traits": {
-                        "smithy.api#documentation": "<p>Index of the polygon corresponding to the \"to\" component of the connection. The polygon is available from <code>Isoline[].Geometries</code>.</p>",
+                        "smithy.api#documentation": "<p>Index of the polygon corresponding to the \"to\" component of the connection.\n         The polygon is available from <code>Isoline[].Geometries</code>.</p>",
                         "smithy.api#range": {
                             "min": 0
                         },
@@ -1274,7 +1282,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Isolines may contain multiple components, if these components are connected by ferry links. These components are returned as separate polygons while the ferry links are returned as connections.</p>"
+                "smithy.api#documentation": "<p>Isolines may contain multiple components, if these components are connected by ferry\n         links. These components are returned as separate polygons while the ferry links are\n         returned as connections.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineConnectionGeometry": {
@@ -1289,12 +1297,12 @@
                 "Polyline": {
                     "target": "com.amazonaws.georoutes#Polyline",
                     "traits": {
-                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression\n         format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Geometry of the connection between different Isoline components.</p>"
+                "smithy.api#documentation": "<p>Geometry of the connection between different isoline components.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineConnectionList": {
@@ -1310,7 +1318,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>"
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>"
                     }
                 },
                 "Heading": {
@@ -1373,7 +1381,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Maximum resolution of the returned isoline.</p>\n         <p>\n            <b>Unit</b>: <code>centimeters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Maximum resolution of the returned isoline.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
                     }
                 }
             },
@@ -1469,20 +1477,20 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint\n         will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
                     }
                 },
                 "Radius": {
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The\n         roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
                     }
                 },
                 "Strategy": {
                     "target": "com.amazonaws.georoutes#MatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers all roads possible, whereas MatchMostSignificantRoad matches to the most significant road.</p>"
+                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers\n         all roads possible, whereas MatchMostSignificantRoad matches to the most significant\n         road.</p>"
                     }
                 }
             },
@@ -1516,7 +1524,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>"
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>"
                     }
                 },
                 "Heading": {
@@ -1540,7 +1548,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options for the property.</p>"
+                "smithy.api#documentation": "<p>Origin related options.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineScooterOptions": {
@@ -1581,7 +1589,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options for the property.</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>"
             }
         },
         "com.amazonaws.georoutes#IsolineShapeGeometry": {
@@ -1590,13 +1598,13 @@
                 "Polygon": {
                     "target": "com.amazonaws.georoutes#LinearRings",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of Isoline Polygons, for each isoline polygon, it contains polygons of the first linear ring (the outer ring) and from 2nd item to the last item (the inner rings).</p>"
+                        "smithy.api#documentation": "<p>A list of Isoline Polygons, for each isoline polygon, it contains polygons of the first\n         linear ring (the outer ring) and from 2nd item to the last item (the inner rings).</p>"
                     }
                 },
                 "PolylinePolygon": {
                     "target": "com.amazonaws.georoutes#PolylineRingList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of Isoline PolylinePolygon, for each isoline PolylinePolygon, it contains PolylinePolygon \n      of the first linear ring (the outer ring) and from 2nd item to the last item (the inner rings). \n      For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>"
+                        "smithy.api#documentation": "<p>A list of Isoline PolylinePolygon, for each isoline PolylinePolygon, it contains\n         PolylinePolygon of the first linear ring (the outer ring) and from 2nd item to the last\n         item (the inner rings). For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>"
                     }
                 }
             },
@@ -1623,7 +1631,7 @@
                 "UseWith": {
                     "target": "com.amazonaws.georoutes#SideOfStreetMatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will\n         always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
                     }
                 }
             },
@@ -1648,7 +1656,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Threshold to be used for the isoline calculation. Up to 3 thresholds per provided type\n         can be requested.</p>"
+                "smithy.api#documentation": "<p>Threshold to be used for the isoline calculation. Up to 5 thresholds per provided type\n         can be requested.</p>"
             }
         },
         "com.amazonaws.georoutes#IsolineTrafficOptions": {
@@ -1658,7 +1666,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration for which flow traffic is considered valid. For this period, the flow traffic is used over historical traffic data. Flow traffic refers to congestion, which changes very quickly. Duration in seconds for which flow traffic event would be considered valid. While flow traffic event is valid it will be used over the historical traffic data. </p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Duration for which flow traffic is considered valid. For this period, the flow traffic\n         is used over historical traffic data. Flow traffic refers to congestion, which changes very\n         quickly. Duration in seconds for which flow traffic event would be considered valid. While\n         flow traffic event is valid it will be used over the historical traffic data. </p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "Usage": {
@@ -1736,7 +1744,7 @@
                 "Scooter": {
                     "target": "com.amazonaws.georoutes#IsolineScooterOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Scooter\"</p>"
+                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>\n         <note>\n            <p>When travel mode is set to <code>Scooter</code>, then the avoidance option\n               <code>ControlledAccessHighways</code> defaults to <code>true</code>.</p>\n         </note>"
                     }
                 },
                 "Truck": {
@@ -1883,20 +1891,20 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
                     }
                 },
                 "WeightPerAxle": {
                     "target": "com.amazonaws.georoutes#WeightKilograms",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for usage in countries where the differences in axle types or axle groups are not distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for\n         usage in countries where the differences in axle types or axle groups are not\n         distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "WeightPerAxleGroup": {
                     "target": "com.amazonaws.georoutes#WeightPerAxleGroup",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries\n         that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "Width": {
@@ -2106,7 +2114,7 @@
             ],
             "traits": {
                 "aws.api#dataPlane": {},
-                "smithy.api#documentation": "<p>Calculates the optimal order to travel between a set of waypoints to minimize either the\n         travel time or the distance travelled during the journey, based on road network\n         restrictions and the traffic pattern data.</p>",
+                "smithy.api#documentation": "<p>\n            <code>OptimizeWaypoints</code> calculates the optimal order to travel between a set of\n         waypoints to minimize either the travel time or the distance travelled during the journey,\n         based on road network restrictions and the traffic pattern data.</p>",
                 "smithy.api#http": {
                     "uri": "/optimize-waypoints",
                     "method": "POST"
@@ -2142,7 +2150,13 @@
                 "Avoid": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationAvoidanceOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Features that are avoided while calculating a route. Avoidance is on a best-case basis. If an\n         avoidance can't be satisfied for a particular case, this setting is ignored.</p>"
+                        "smithy.api#documentation": "<p>Features that are avoided. Avoidance is on a best-case basis. If an avoidance can't be\n         satisfied for a particular case, this setting is ignored.</p>"
+                    }
+                },
+                "Clustering": {
+                    "target": "com.amazonaws.georoutes#WaypointOptimizationClusteringOptions",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Clustering allows you to specify how nearby waypoints can be clustered to improve the\n         optimized sequence.</p>"
                     }
                 },
                 "DepartureTime": {
@@ -2210,7 +2224,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
                     }
                 },
                 "TravelModeOptions": {
@@ -2236,7 +2250,7 @@
                 "Connections": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationConnectionList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Details about the connection from one waypoint to the next, within the optimized sequence.</p>",
+                        "smithy.api#documentation": "<p>Details about the connection from one waypoint to the next, within the optimized\n         sequence.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -2259,7 +2273,7 @@
                 "ImpedingWaypoints": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationImpedingWaypointList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Returns waypoints that caused the optimization problem to fail, and the constraints that were unsatisfied leading to the failure.</p>",
+                        "smithy.api#documentation": "<p>Returns waypoints that caused the optimization problem to fail, and the constraints that\n         were unsatisfied leading to the failure.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -2308,14 +2322,14 @@
                 "Polyline": {
                     "target": "com.amazonaws.georoutes#Polyline",
                     "traits": {
-                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression\n         format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>",
                         "smithy.api#required": {}
                     }
                 },
                 "Radius": {
                     "target": "smithy.api#Integer",
                     "traits": {
-                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>",
+                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The\n         roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>",
                         "smithy.api#required": {}
                     }
                 }
@@ -2489,7 +2503,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Notices provide information around factors that may have influenced snapping in a manner atypical to the standard use cases.</p>"
+                "smithy.api#documentation": "<p>Notices provide information around factors that may have influenced snapping in a manner\n         atypical to the standard use cases.</p>"
             }
         },
         "com.amazonaws.georoutes#RoadSnapNoticeCode": {
@@ -2545,7 +2559,7 @@
                 "Polyline": {
                     "target": "com.amazonaws.georoutes#Polyline",
                     "traits": {
-                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression\n         format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
                     }
                 }
             },
@@ -2577,7 +2591,7 @@
                 "SnappedPosition": {
                     "target": "com.amazonaws.georoutes#Position",
                     "traits": {
-                        "smithy.api#documentation": "<p>Snapped position of the TracePoint provided within the request, at the same index. </p>",
+                        "smithy.api#documentation": "<p>Snapped position of the TracePoint provided within the request, at the same index.\n      </p>",
                         "smithy.api#required": {}
                     }
                 }
@@ -2747,7 +2761,7 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
                     }
                 },
                 "Width": {
@@ -2782,14 +2796,14 @@
                 "Legs": {
                     "target": "com.amazonaws.georoutes#RouteLegList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A leg is a section of a route from one waypoint to the next. A leg could be of type Vehicle, Pedestrian or Ferry.\nLegs of different types could occur together within a single route. For example, a car employing the use of a Ferry will contain Vehicle legs corresponding to journey on land, and Ferry legs corresponding to the journey via Ferry.</p>",
+                        "smithy.api#documentation": "<p>A leg is a section of a route from one waypoint to the next. A leg could be of type\n         Vehicle, Pedestrian or Ferry. Legs of different types could occur together within a single\n         route. For example, a car employing the use of a Ferry will contain Vehicle legs\n         corresponding to journey on land, and Ferry legs corresponding to the journey via\n         Ferry.</p>",
                         "smithy.api#required": {}
                     }
                 },
                 "MajorRoadLabels": {
                     "target": "com.amazonaws.georoutes#RouteMajorRoadLabelList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Important labels including names and route numbers that differentiate the current route from the alternatives presented.</p>",
+                        "smithy.api#documentation": "<p>Important labels including names and route numbers that differentiate the current route\n         from the alternatives presented.</p>",
                         "smithy.api#length": {
                             "min": 0,
                             "max": 2
@@ -2814,18 +2828,18 @@
                 "Hot": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating the route.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 },
                 "Hov": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating the route.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Features that are allowed while calculating. a route</p>"
+                "smithy.api#documentation": "<p>Features that are allowed while calculating a route.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteAvoidanceArea": {
@@ -2834,7 +2848,7 @@
                 "Except": {
                     "target": "com.amazonaws.georoutes#RouteAvoidanceAreaGeometryList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Exceptions to the provided avoidance geometry, to be included while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Exceptions to the provided avoidance geometry, to be included while calculating the\n         route.</p>"
                     }
                 },
                 "Geometry": {
@@ -2854,7 +2868,7 @@
                 "Corridor": {
                     "target": "com.amazonaws.georoutes#Corridor",
                     "traits": {
-                        "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of the corridor.</p>"
+                        "smithy.api#documentation": "<p>Geometry defined as a corridor - a LineString with a radius that defines the width of\n         the corridor.</p>"
                     }
                 },
                 "BoundingBox": {
@@ -2882,7 +2896,7 @@
                 "PolylinePolygon": {
                     "target": "com.amazonaws.georoutes#PolylineRingList",
                     "traits": {
-                        "smithy.api#documentation": "<p>A list of Isoline PolylinePolygon, for each isoline PolylinePolygon, it contains PolylinePolygon \n      of the first linear ring (the outer ring) and from 2nd item to the last item (the inner rings). \n      For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>",
+                        "smithy.api#documentation": "<p>A list of Isoline PolylinePolygon, for each isoline PolylinePolygon, it contains\n         PolylinePolygon of the first linear ring (the outer ring) and from 2nd item to the last\n         item (the inner rings). For more information on polyline encoding, see <a href=\"https://github.com/heremaps/flexiblepolyline/blob/master/README.md\">https://github.com/heremaps/flexiblepolyline/blob/master/README.md</a>.</p>",
                         "smithy.api#length": {
                             "min": 1,
                             "max": 1
@@ -2960,7 +2974,7 @@
                 "TruckRoadTypes": {
                     "target": "com.amazonaws.georoutes#TruckRoadTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n         <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
                     }
                 },
                 "Tunnels": {
@@ -2983,7 +2997,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options related to areas to be avoided.</p>"
+                "smithy.api#documentation": "<p>Specifies options for areas to avoid when calculating the route. This is a best-effort\n         avoidance setting, meaning the router will try to honor the avoidance preferences but may\n         still include restricted areas if no feasible alternative route exists. If avoidance\n         options are not followed, the response will indicate that the avoidance criteria were\n         violated.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteAvoidanceZoneCategory": {
@@ -3050,7 +3064,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Car\"</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Car</code>.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteContinueHighwayStepDetails": {
@@ -3109,7 +3123,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>",
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>",
                         "smithy.api#range": {
                             "max": 2000
                         }
@@ -3210,7 +3224,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Interval of the driver work-rest schedule. \n      Stops are added to fulfil the provided rest schedule.</p>"
+                "smithy.api#documentation": "<p>Interval of the driver work-rest schedule. Stops are added to fulfil the provided rest\n         schedule.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteDriverScheduleIntervalList": {
@@ -3225,19 +3239,19 @@
                 "Co2EmissionClass": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>The CO 2  emission classes.</p>"
+                        "smithy.api#documentation": "<p>The CO 2 emission classes.</p>"
                     }
                 },
                 "Type": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>Type of the emission.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5, Euro6, EuroEev</code>\n         </p>",
+                        "smithy.api#documentation": "<p>Type of the emission.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5,\n            Euro6, EuroEev</code>\n         </p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Type of the emission.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5, Euro6, EuroEev</code>\n         </p>"
+                "smithy.api#documentation": "<p>Type of the emission.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5,\n            Euro6, EuroEev</code>\n         </p>"
             }
         },
         "com.amazonaws.georoutes#RouteEngineType": {
@@ -3299,13 +3313,13 @@
                 "Countries": {
                     "target": "com.amazonaws.georoutes#CountryCodeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country codes.</p>",
+                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country\n         codes.</p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Exclusion options for the route.</p>"
+                "smithy.api#documentation": "<p>Specifies strict exclusion options for the route calculation. This setting mandates that\n         the router will avoid any routes that include the specified options, rather than merely\n         attempting to minimize them.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteExitStepDetails": {
@@ -3521,14 +3535,14 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#RouteFerryNoticeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>",
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>",
                         "smithy.api#required": {}
                     }
                 },
                 "PassThroughWaypoints": {
                     "target": "com.amazonaws.georoutes#RoutePassThroughWaypointList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were configured with the PassThrough option.</p>",
+                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were\n         configured with the PassThrough option.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -3576,12 +3590,12 @@
                 "Impact": {
                     "target": "com.amazonaws.georoutes#RouteNoticeImpact",
                     "traits": {
-                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High impact notices must be evaluated further to determine the impact.</p>"
+                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High\n         impact notices must be evaluated further to determine the impact.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>"
+                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteFerryNoticeCode": {
@@ -3607,6 +3621,10 @@
                     {
                         "name": "VIOLATED_AVOID_RAIL_FERRY",
                         "value": "ViolatedAvoidRailFerry"
+                    },
+                    {
+                        "name": "SEASONAL_CLOSURE",
+                        "value": "SeasonalClosure"
                     }
                 ]
             }
@@ -3690,14 +3708,14 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>"
+                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
                     }
                 },
                 "Duration": {
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "GeometryOffset": {
@@ -3718,7 +3736,7 @@
                 "Region": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a state.</p>",
+                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a\n         state.</p>",
                         "smithy.api#length": {
                             "min": 0,
                             "max": 3
@@ -3727,7 +3745,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Span  computed for the requested SpanAdditionalFeatures.</p>"
+                "smithy.api#documentation": "<p>Span computed for the requested SpanAdditionalFeatures.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteFerrySpanList": {
@@ -3742,18 +3760,18 @@
                 "Overview": {
                     "target": "com.amazonaws.georoutes#RouteFerryOverviewSummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel steps.</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel\n         steps.</p>"
                     }
                 },
                 "TravelOnly": {
                     "target": "com.amazonaws.georoutes#RouteFerryTravelOnlySummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is in meters</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is in meters</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is the same as the Distance within the Overview summary.</p>"
+                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is the same as the Distance within the Overview summary.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteFerryTravelOnlySummary": {
@@ -3763,13 +3781,13 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>",
+                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration\n         possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is the same as the Distance within the Overview summary.</p>"
+                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is the same as the Distance within the Overview summary.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteFerryTravelStep": {
@@ -3970,7 +3988,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#RouteLegTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>",
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -3989,7 +4007,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>A leg is a section of a route from one waypoint to the next. A leg could be of type Vehicle, Pedestrian or Ferry.\nLegs of different types could occur together within a single route. For example, a car employing the use of a Ferry will contain Vehicle legs corresponding to journey on land, and Ferry legs corresponding to the journey via Ferry.</p>"
+                "smithy.api#documentation": "<p>A leg is a section of a route from one waypoint to the next. A leg could be of type\n         Vehicle, Pedestrian or Ferry. Legs of different types could occur together within a single\n         route. For example, a car employing the use of a Ferry will contain Vehicle legs\n         corresponding to journey on land, and Ferry legs corresponding to the journey via\n         Ferry.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteLegAdditionalFeature": {
@@ -4059,7 +4077,7 @@
                 "Polyline": {
                     "target": "com.amazonaws.georoutes#Polyline",
                     "traits": {
-                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>An ordered list of positions used to plot a route on a map in a lossy compression\n         format.</p>\n         <note>\n            <p>LineString and Polyline are mutually exclusive properties.</p>\n         </note>"
                     }
                 }
             },
@@ -4096,6 +4114,10 @@
                     {
                         "name": "TRUCK",
                         "value": "Truck"
+                    },
+                    {
+                        "name": "CAR_SHUTTLE_TRAIN",
+                        "value": "CarShuttleTrain"
                     }
                 ]
             }
@@ -4142,7 +4164,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Important labels including names and route numbers that differentiate the current route from the alternatives presented.</p>"
+                "smithy.api#documentation": "<p>Important labels including names and route numbers that differentiate the current route\n         from the alternatives presented.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMajorRoadLabelList": {
@@ -4167,20 +4189,20 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint\n         will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>"
                     }
                 },
                 "Radius": {
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The\n         roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
                     }
                 },
                 "Strategy": {
                     "target": "com.amazonaws.georoutes#MatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers all roads possible, whereas MatchMostSignificantRoad matches to the most significant road.</p>"
+                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers\n         all roads possible, whereas MatchMostSignificantRoad matches to the most significant\n         road.</p>"
                     }
                 }
             },
@@ -4200,13 +4222,13 @@
                 "Hot": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hot (High Occupancy Toll) lanes while calculating the route.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 },
                 "Hov": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating the route.</p>"
+                        "smithy.api#documentation": "<p>Allow Hov (High Occupancy vehicle) lanes while calculating the route.</p>\n         <p>Default value: <code>false</code>\n         </p>"
                     }
                 }
             },
@@ -4350,7 +4372,7 @@
                 "TruckRoadTypes": {
                     "target": "com.amazonaws.georoutes#TruckRoadTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n         <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
                     }
                 },
                 "Tunnels": {
@@ -4373,7 +4395,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options related to the route matrix.</p>"
+                "smithy.api#documentation": "<p>Specifies options for areas to avoid when calculating the route. This is a best-effort\n         avoidance setting, meaning the router will try to honor the avoidance preferences but may\n         still include restricted areas if no feasible alternative route exists. If avoidance\n         options are not followed, the response will indicate that the avoidance criteria were\n         violated.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixAvoidanceZoneCategory": {
@@ -4414,12 +4436,12 @@
                 "Unbounded": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>No restrictions in terms of a routing boundary, and is typically used for longer routes.</p>"
+                        "smithy.api#documentation": "<p>No restrictions in terms of a routing boundary, and is typically used for longer\n         routes.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. All data, origins and destinations outside the boundary are considered invalid.</p>"
+                "smithy.api#documentation": "<p>Boundary within which the matrix is to be calculated. All data, origins and destinations\n         outside the boundary are considered invalid.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixBoundaryGeometry": {
@@ -4434,7 +4456,7 @@
                 "Circle": {
                     "target": "com.amazonaws.georoutes#Circle",
                     "traits": {
-                        "smithy.api#documentation": "<p>Geometry defined as a circle. When request routing boundary was set as <code>AutoCircle</code>, the response routing boundary will return <code>Circle</code> derived from the <code>AutoCircle</code> settings.</p>"
+                        "smithy.api#documentation": "<p>Geometry defined as a circle. When request routing boundary was set as\n            <code>AutoCircle</code>, the response routing boundary will return <code>Circle</code>\n         derived from the <code>AutoCircle</code> settings.</p>"
                     }
                 },
                 "BoundingBox": {
@@ -4490,7 +4512,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options related to the car.</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Car</code>.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixDestination": {
@@ -4527,7 +4549,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>",
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>",
                         "smithy.api#range": {
                             "min": 0
                         }
@@ -4584,7 +4606,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The calculated route matrix containing the results for all pairs of Origins to Destination positions. Each row corresponds to one entry in Origins. Each entry in the row corresponds to the route from that entry in Origins to an entry in Destination positions.</p>"
+                "smithy.api#documentation": "<p>The calculated route matrix containing the results for all pairs of Origins to\n         Destination positions. Each row corresponds to one entry in Origins. Each entry in the row\n         corresponds to the route from that entry in Origins to an entry in Destination\n         positions.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixErrorCode": {
@@ -4636,13 +4658,13 @@
                 "Countries": {
                     "target": "com.amazonaws.georoutes#CountryCodeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country codes.</p>",
+                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country\n         codes.</p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Exclusion options.</p>"
+                "smithy.api#documentation": "<p>Specifies strict exclusion options for the route calculation. This setting mandates that\n         the router will avoid any routes that include the specified options, rather than merely\n         attempting to minimize them.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixHazardousCargoType": {
@@ -4721,7 +4743,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>",
+                        "smithy.api#documentation": "<p>If the distance to a highway/bridge/tunnel/sliproad is within threshold, the waypoint\n         will be snapped to the highway/bridge/tunnel/sliproad.</p>\n         <p>\n            <b>Unit</b>: <code>meters</code>\n         </p>",
                         "smithy.api#range": {
                             "min": 0
                         }
@@ -4731,13 +4753,13 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Considers all roads within the provided radius to match the provided destination to. The\n         roads that are considered are determined by the provided Strategy.</p>\n         <p>\n            <b>Unit</b>: <code>Meters</code>\n         </p>"
                     }
                 },
                 "Strategy": {
                     "target": "com.amazonaws.georoutes#MatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers all roads possible, whereas MatchMostSignificantRoad matches to the most significant road.</p>"
+                        "smithy.api#documentation": "<p>Strategy that defines matching of the position onto the road network. MatchAny considers\n         all roads possible, whereas MatchMostSignificantRoad matches to the most significant\n         road.</p>"
                     }
                 }
             },
@@ -4779,7 +4801,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>",
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>",
                         "smithy.api#range": {
                             "min": 0
                         }
@@ -4847,7 +4869,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Scooter\"</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>"
             }
         },
         "com.amazonaws.georoutes#RouteMatrixSideOfStreetOptions": {
@@ -4863,7 +4885,7 @@
                 "UseWith": {
                     "target": "com.amazonaws.georoutes#SideOfStreetMatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will\n         always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
                     }
                 }
             },
@@ -4878,7 +4900,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration for which flow traffic is considered valid. \n      For this period, the flow traffic is used over historical traffic data. \n      Flow traffic refers to congestion, which changes very quickly. \n      Duration in seconds for which flow traffic event would be considered valid. \n      While flow traffic event is valid it will be used over the historical traffic data. </p>"
+                        "smithy.api#documentation": "<p>Duration for which flow traffic is considered valid. For this period, the flow traffic\n         is used over historical traffic data. Flow traffic refers to congestion, which changes very\n         quickly. Duration in seconds for which flow traffic event would be considered valid. While\n         flow traffic event is valid it will be used over the historical traffic data. </p>"
                     }
                 },
                 "Usage": {
@@ -4945,7 +4967,7 @@
                 "Scooter": {
                     "target": "com.amazonaws.georoutes#RouteMatrixScooterOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Scooter\"</p>"
+                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>\n         <note>\n            <p>When travel mode is set to <code>Scooter</code>, then the avoidance option\n               <code>ControlledAccessHighways</code> defaults to <code>true</code>.</p>\n         </note>"
                     }
                 },
                 "Truck": {
@@ -5064,20 +5086,20 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
                     }
                 },
                 "WeightPerAxle": {
                     "target": "com.amazonaws.georoutes#WeightKilograms",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for usage in countries where the differences in axle types or axle groups are not distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for\n         usage in countries where the differences in axle types or axle groups are not\n         distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "WeightPerAxleGroup": {
                     "target": "com.amazonaws.georoutes#WeightPerAxleGroup",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries that have different regulations based on the axle group type.</p>"
+                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries\n         that have different regulations based on the axle group type.</p>"
                     }
                 },
                 "Width": {
@@ -5233,7 +5255,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>",
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>",
                         "smithy.api#range": {
                             "max": 2000
                         }
@@ -5320,7 +5342,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>If the waypoint should be treated as a stop. If yes, the route is split up into different legs around the stop.</p>"
+                "smithy.api#documentation": "<p>If the waypoint should be treated as a stop. If yes, the route is split up into\n         different legs around the stop.</p>"
             }
         },
         "com.amazonaws.georoutes#RoutePassThroughWaypointList": {
@@ -5391,14 +5413,14 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#RoutePedestrianNoticeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>",
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>",
                         "smithy.api#required": {}
                     }
                 },
                 "PassThroughWaypoints": {
                     "target": "com.amazonaws.georoutes#RoutePassThroughWaypointList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were configured with the PassThrough option.</p>",
+                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were\n         configured with the PassThrough option.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -5440,12 +5462,12 @@
                 "Impact": {
                     "target": "com.amazonaws.georoutes#RouteNoticeImpact",
                     "traits": {
-                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High impact notices must be evaluated further to determine the impact.</p>"
+                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High\n         impact notices must be evaluated further to determine the impact.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>"
+                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>"
             }
         },
         "com.amazonaws.georoutes#RoutePedestrianNoticeCode": {
@@ -5586,14 +5608,14 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>"
+                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>"
                     }
                 },
                 "Duration": {
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "DynamicSpeed": {
@@ -5624,7 +5646,7 @@
                 "Incidents": {
                     "target": "com.amazonaws.georoutes#IndexList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Incidents corresponding to the span. These index into the Incidents in the parent Leg.</p>"
+                        "smithy.api#documentation": "<p>Incidents corresponding to the span. These index into the Incidents in the parent\n         Leg.</p>"
                     }
                 },
                 "Names": {
@@ -5642,7 +5664,7 @@
                 "Region": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a state.</p>",
+                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a\n         state.</p>",
                         "smithy.api#length": {
                             "min": 0,
                             "max": 3
@@ -5691,18 +5713,18 @@
                 "Overview": {
                     "target": "com.amazonaws.georoutes#RoutePedestrianOverviewSummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel steps.</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel\n         steps.</p>"
                     }
                 },
                 "TravelOnly": {
                     "target": "com.amazonaws.georoutes#RoutePedestrianTravelOnlySummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is in meters</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is in meters</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel steps.</p>"
+                "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel\n         steps.</p>"
             }
         },
         "com.amazonaws.georoutes#RoutePedestrianTravelOnlySummary": {
@@ -5805,7 +5827,7 @@
                 "Signpost": {
                     "target": "com.amazonaws.georoutes#RouteSignpost",
                     "traits": {
-                        "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See RouteSignpost for details of sub-attributes.</p>"
+                        "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See\n         RouteSignpost for details of sub-attributes.</p>"
                     }
                 },
                 "TurnStepDetails": {
@@ -5930,12 +5952,12 @@
                 "Impact": {
                     "target": "com.amazonaws.georoutes#RouteNoticeImpact",
                     "traits": {
-                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High impact notices must be evaluated further to determine the impact.</p>"
+                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High\n         impact notices must be evaluated further to determine the impact.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>"
+                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteResponseNoticeCode": {
@@ -6162,7 +6184,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Scooter\"</p>"
+                "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>"
             }
         },
         "com.amazonaws.georoutes#RouteSideOfStreet": {
@@ -6213,7 +6235,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See RouteSignpost for details of sub-attributes.</p>"
+                "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See\n         RouteSignpost for details of sub-attributes.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteSignpostLabel": {
@@ -6688,7 +6710,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is the same as the Distance within the Overview summary.</p>"
+                "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is the same as the Distance within the Overview summary.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteToll": {
@@ -6723,7 +6745,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Provides details about toll information along a route, including the payment sites, applicable toll rates, toll systems, and the country associated with the toll collection.</p>"
+                "smithy.api#documentation": "<p>Provides details about toll information along a route, including the payment sites,\n         applicable toll rates, toll systems, and the country associated with the toll\n         collection.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteTollList": {
@@ -6744,19 +6766,19 @@
                 "AllVignettes": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies if the user has valid vignettes with access for all toll roads. If a user has a vignette for a toll road, then toll cost for that road is omitted since no further payment is necessary.</p>"
+                        "smithy.api#documentation": "<p>Specifies if the user has valid vignettes with access for all toll roads. If a user has\n         a vignette for a toll road, then toll cost for that road is omitted since no further\n         payment is necessary.</p>"
                     }
                 },
                 "Currency": {
                     "target": "com.amazonaws.georoutes#CurrencyCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the request.</p>"
+                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the\n         request.</p>"
                     }
                 },
                 "EmissionType": {
                     "target": "com.amazonaws.georoutes#RouteEmissionType",
                     "traits": {
-                        "smithy.api#documentation": "<p>Emission type of the vehicle for toll cost calculation.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5, Euro6, EuroEev</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Emission type of the vehicle for toll cost calculation.</p>\n         <p>\n            <b>Valid values</b>: <code>Euro1, Euro2, Euro3, Euro4, Euro5,\n            Euro6, EuroEev</code>\n         </p>"
                     }
                 },
                 "VehicleCategory": {
@@ -6949,7 +6971,7 @@
                 "Currency": {
                     "target": "com.amazonaws.georoutes#CurrencyCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the request.</p>",
+                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the\n         request.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -6970,7 +6992,7 @@
                 "Range": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>If the price is a range or an exact value. If any of the toll fares making up the route is a range, the overall price is also a range.</p>",
+                        "smithy.api#documentation": "<p>If the price is a range or an exact value. If any of the toll fares making up the route\n         is a range, the overall price is also a range.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -7001,7 +7023,7 @@
                 "Currency": {
                     "target": "com.amazonaws.georoutes#CurrencyCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the request.</p>",
+                        "smithy.api#documentation": "<p>Currency code corresponding to the price. This is the same as Currency specified in the\n         request.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -7015,7 +7037,7 @@
                 "Range": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>If the price is a range or an exact value. If any of the toll fares making up the route is a range, the overall price is also a range.</p>",
+                        "smithy.api#documentation": "<p>If the price is a range or an exact value. If any of the toll fares making up the route\n         is a range, the overall price is also a range.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -7187,7 +7209,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration for which flow \n      traffic is considered valid. \n      For this period, the flow traffic is used over historical traffic data. \n      Flow traffic refers to congestion, which changes very quickly. \n      Duration in seconds for which flow traffic event would be considered valid. \n      While flow traffic event is valid it will be used over the historical traffic data. </p>"
+                        "smithy.api#documentation": "<p>Duration for which flow traffic is considered valid. For this period, the flow traffic\n         is used over historical traffic data. Flow traffic refers to congestion, which changes very\n         quickly. Duration in seconds for which flow traffic event would be considered valid. While\n         flow traffic event is valid it will be used over the historical traffic data. </p>"
                     }
                 },
                 "Usage": {
@@ -7291,7 +7313,7 @@
                 "Scooter": {
                     "target": "com.amazonaws.georoutes#RouteScooterOptions",
                     "traits": {
-                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is \"Scooter\"</p>"
+                        "smithy.api#documentation": "<p>Travel mode options when the provided travel mode is <code>Scooter</code>\n         </p>\n         <note>\n            <p>When travel mode is set to <code>Scooter</code>, then the avoidance option\n               <code>ControlledAccessHighways</code> defaults to <code>true</code>.</p>\n         </note>"
                     }
                 },
                 "Truck": {
@@ -7453,7 +7475,7 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>",
                         "smithy.api#length": {
                             "max": 20
                         }
@@ -7463,13 +7485,13 @@
                     "target": "com.amazonaws.georoutes#WeightKilograms",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for usage in countries where the differences in axle types or axle groups are not distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for\n         usage in countries where the differences in axle types or axle groups are not\n         distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "WeightPerAxleGroup": {
                     "target": "com.amazonaws.georoutes#WeightPerAxleGroup",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries\n         that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "Width": {
@@ -7654,7 +7676,7 @@
                 "Severity": {
                     "target": "com.amazonaws.georoutes#RouteVehicleIncidentSeverity",
                     "traits": {
-                        "smithy.api#documentation": "<p>Severity of the incident\nCritical - The part of the route the incident affects is unusable.\nMajor- Major impact on the leg duration, for example stop and go\nMinor- Minor impact on the leg duration, for example traffic jam\nLow - Low on duration, for example slightly increased traffic</p>"
+                        "smithy.api#documentation": "<p>Severity of the incident Critical - The part of the route the incident affects is\n         unusable. Major- Major impact on the leg duration, for example stop and go Minor- Minor\n         impact on the leg duration, for example traffic jam Low - Low on duration, for example\n         slightly increased traffic</p>"
                     }
                 },
                 "StartTime": {
@@ -7781,14 +7803,14 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#RouteVehicleNoticeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>",
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>",
                         "smithy.api#required": {}
                     }
                 },
                 "PassThroughWaypoints": {
                     "target": "com.amazonaws.georoutes#RoutePassThroughWaypointList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were configured with the PassThrough option.</p>",
+                        "smithy.api#documentation": "<p>Waypoints that were passed through during the leg. This includes the waypoints that were\n         configured with the PassThrough option.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -7829,7 +7851,7 @@
                 "TruckRoadTypes": {
                     "target": "com.amazonaws.georoutes#TruckRoadTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n         <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>",
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>",
                         "smithy.api#required": {}
                     }
                 },
@@ -7883,12 +7905,12 @@
                 "Impact": {
                     "target": "com.amazonaws.georoutes#RouteNoticeImpact",
                     "traits": {
-                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High impact notices must be evaluated further to determine the impact.</p>"
+                        "smithy.api#documentation": "<p>Impact corresponding to the issue. While Low impact notices can be safely ignored, High\n         impact notices must be evaluated further to determine the impact.</p>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>"
+                "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteVehicleNoticeCode": {
@@ -8045,7 +8067,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration\n         possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "Distance": {
@@ -8144,14 +8166,14 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>"
+                        "smithy.api#documentation": "<p>Distance of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>"
                     }
                 },
                 "Duration": {
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Duration of the computed span. This feature doesn't split a span, but is always computed\n         on a span split by other properties.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "DynamicSpeed": {
@@ -8173,7 +8195,7 @@
                 "Gate": {
                     "target": "com.amazonaws.georoutes#RouteSpanGateAttribute",
                     "traits": {
-                        "smithy.api#documentation": "<p>Attributes corresponding to a gate. The gate is present at the end of the returned span.</p>"
+                        "smithy.api#documentation": "<p>Attributes corresponding to a gate. The gate is present at the end of the returned\n         span.</p>"
                     }
                 },
                 "GeometryOffset": {
@@ -8188,7 +8210,7 @@
                 "Incidents": {
                     "target": "com.amazonaws.georoutes#IndexList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Incidents corresponding to the span. These index into the Incidents in the parent Leg.</p>"
+                        "smithy.api#documentation": "<p>Incidents corresponding to the span. These index into the Incidents in the parent\n         Leg.</p>"
                     }
                 },
                 "Names": {
@@ -8200,19 +8222,19 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#IndexList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>"
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>"
                     }
                 },
                 "RailwayCrossing": {
                     "target": "com.amazonaws.georoutes#RouteSpanRailwayCrossingAttribute",
                     "traits": {
-                        "smithy.api#documentation": "<p>Attributes corresponding to a railway crossing. The gate is present at the end of the returned span.</p>"
+                        "smithy.api#documentation": "<p>Attributes corresponding to a railway crossing. The gate is present at the end of the\n         returned span.</p>"
                     }
                 },
                 "Region": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a state.</p>",
+                        "smithy.api#documentation": "<p>2-3 letter Region code corresponding to the Span. This is either a province or a\n         state.</p>",
                         "smithy.api#length": {
                             "min": 0,
                             "max": 3
@@ -8258,7 +8280,7 @@
                 "TruckRoadTypes": {
                     "target": "com.amazonaws.georoutes#IndexList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n         <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
                     }
                 },
                 "TypicalDuration": {
@@ -8291,13 +8313,13 @@
                 "Overview": {
                     "target": "com.amazonaws.georoutes#RouteVehicleOverviewSummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel steps.</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including before travel, travel and after travel\n         steps.</p>"
                     }
                 },
                 "TravelOnly": {
                     "target": "com.amazonaws.georoutes#RouteVehicleTravelOnlySummary",
                     "traits": {
-                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel only portion of the journey is in meters</p>"
+                        "smithy.api#documentation": "<p>Summarized details for the leg including travel steps only. The Distance for the travel\n         only portion of the journey is in meters</p>"
                     }
                 }
             },
@@ -8312,7 +8334,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Total duration in free flowing traffic, which is the best case or shortest duration\n         possible to cover the leg.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "Duration": {
@@ -8443,7 +8465,7 @@
                 "Signpost": {
                     "target": "com.amazonaws.georoutes#RouteSignpost",
                     "traits": {
-                        "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See RouteSignpost for details of sub-attributes.</p>"
+                        "smithy.api#documentation": "<p>Sign post information of the action, applicable only for TurnByTurn steps. See\n         RouteSignpost for details of sub-attributes.</p>"
                     }
                 },
                 "TurnStepDetails": {
@@ -8541,7 +8563,7 @@
                 "AllHazardsRestricted": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>This restriction applies to truck cargo, where the resulting route excludes roads on which hazardous materials are prohibited from being transported.</p>"
+                        "smithy.api#documentation": "<p>This restriction applies to truck cargo, where the resulting route excludes roads on\n         which hazardous materials are prohibited from being transported.</p>"
                     }
                 },
                 "AxleCount": {
@@ -8644,7 +8666,7 @@
                 "TruckRoadType": {
                     "target": "smithy.api#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to Sweden. \n         <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
+                        "smithy.api#documentation": "<p>Truck road type identifiers. <code>BK1</code> through <code>BK4</code> apply only to\n         Sweden. <code>A2,A4,B2,B4,C,D,ET2,ET4</code> apply only to Mexico.</p>\n         <note>\n            <p>There are currently no other supported values as of 26th April 2024.</p>\n         </note>"
                     }
                 },
                 "TruckType": {
@@ -8656,12 +8678,12 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>This property contains a \n      summary of violated constraints.</p>"
+                "smithy.api#documentation": "<p>This property contains a summary of violated constraints.</p>"
             }
         },
         "com.amazonaws.georoutes#RouteWaypoint": {
@@ -8671,7 +8693,7 @@
                     "target": "com.amazonaws.georoutes#DistanceMeters",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in moving vehicles who may not have sufficient time to make an action at an origin or a destination.</p>",
+                        "smithy.api#documentation": "<p>Avoids actions for the provided distance. This is typically to consider for users in\n         moving vehicles who may not have sufficient time to make an action at an origin or a\n         destination.</p>",
                         "smithy.api#range": {
                             "max": 2000
                         }
@@ -8699,7 +8721,7 @@
                 "PassThrough": {
                     "target": "smithy.api#Boolean",
                     "traits": {
-                        "smithy.api#documentation": "<p>If the waypoint should not be treated as a stop. If yes, the waypoint is passed through and doesn't split the route into different legs.</p>"
+                        "smithy.api#documentation": "<p>If the waypoint should not be treated as a stop. If yes, the waypoint is passed through\n         and doesn't split the route into different legs.</p>"
                     }
                 },
                 "Position": {
@@ -8889,7 +8911,7 @@
                         "content-type"
                     ]
                 },
-                "smithy.api#documentation": "<p>With the Amazon Location Routes API you can calculate\n       routes and estimate travel time based on up-to-date road network and live \n       traffic information.</p>\n         <p>Calculate optimal travel routes and estimate travel times using up-to-date road network and traffic data. Key features include:</p>\n         <ul>\n            <li>\n               <p>Point-to-point routing with estimated travel time, distance, and turn-by-turn directions</p>\n            </li>\n            <li>\n               <p>Multi-point route optimization to minimize travel time or distance</p>\n            </li>\n            <li>\n               <p>Route matrices for efficient multi-destination planning</p>\n            </li>\n            <li>\n               <p>Isoline calculations to determine reachable areas within specified time or distance thresholds</p>\n            </li>\n            <li>\n               <p>Map-matching to align GPS traces with the road network</p>\n            </li>\n         </ul>",
+                "smithy.api#documentation": "<p>With the Amazon Location Routes API you can calculate routes and estimate travel time\n         based on up-to-date road network and live traffic information.</p>\n         <p>Calculate optimal travel routes and estimate travel times using up-to-date road network\n         and traffic data. Key features include:</p>\n         <ul>\n            <li>\n               <p>Point-to-point routing with estimated travel time, distance, and turn-by-turn\n               directions</p>\n            </li>\n            <li>\n               <p>Multi-point route optimization to minimize travel time or distance</p>\n            </li>\n            <li>\n               <p>Route matrices for efficient multi-destination planning</p>\n            </li>\n            <li>\n               <p>Isoline calculations to determine reachable areas within specified time or\n               distance thresholds</p>\n            </li>\n            <li>\n               <p>Map-matching to align GPS traces with the road network</p>\n            </li>\n         </ul>",
                 "smithy.api#title": "Amazon Location Service Routes V2",
                 "smithy.rules#endpointRuleSet": {
                     "version": "1.0",
@@ -10033,7 +10055,7 @@
             ],
             "traits": {
                 "aws.api#dataPlane": {},
-                "smithy.api#documentation": "<p>The SnapToRoads action matches GPS trace to roads most likely traveled on.</p>",
+                "smithy.api#documentation": "<p>\n            <code>SnapToRoads</code> matches GPS trace to roads most likely traveled on.</p>",
                 "smithy.api#http": {
                     "uri": "/snap-to-roads",
                     "method": "POST"
@@ -10110,7 +10132,7 @@
                 "TravelMode": {
                     "target": "com.amazonaws.georoutes#RoadSnapTravelMode",
                     "traits": {
-                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. \n      Used in estimating the speed of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Specifies the mode of transport when calculating a route. Used in estimating the speed\n         of travel and road compatibility.</p>\n         <p>Default Value: <code>Car</code>\n         </p>"
                     }
                 },
                 "TravelModeOptions": {
@@ -10130,7 +10152,7 @@
                 "Notices": {
                     "target": "com.amazonaws.georoutes#RoadSnapNoticeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during route calculation.</p>",
+                        "smithy.api#documentation": "<p>Notices are additional information returned that indicate issues that occurred during\n         route calculation.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -10334,7 +10356,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>The input fails to satisfy the constraints specified by the Amazon Location service.</p>"
+                "smithy.api#documentation": "<p>The input fails to satisfy the constraints specified by the Amazon Location\n         service.</p>"
             }
         },
         "com.amazonaws.georoutes#ValidationExceptionFieldList": {
@@ -10530,7 +10552,43 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options for WaypointOptimizationAvoidance.</p>"
+                "smithy.api#documentation": "<p>Specifies options for areas to avoid. This is a best-effort avoidance setting, meaning\n         the router will try to honor the avoidance preferences but may still include restricted\n         areas if no feasible alternative route exists. If avoidance options are not followed, the\n         response will indicate that the avoidance criteria were violated.</p>"
+            }
+        },
+        "com.amazonaws.georoutes#WaypointOptimizationClusteringAlgorithm": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "name": "DRIVING_DISTANCE",
+                        "value": "DrivingDistance"
+                    },
+                    {
+                        "name": "TOPOLOGY_SEGMENT",
+                        "value": "TopologySegment"
+                    }
+                ]
+            }
+        },
+        "com.amazonaws.georoutes#WaypointOptimizationClusteringOptions": {
+            "type": "structure",
+            "members": {
+                "Algorithm": {
+                    "target": "com.amazonaws.georoutes#WaypointOptimizationClusteringAlgorithm",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The algorithm to be used. <code>DrivingDistance</code> assigns all the waypoints that\n         are within driving distance of each other into a single cluster.\n            <code>TopologySegment</code> assigns all the waypoints that are within the same topology\n         segment into a single cluster. A Topology segment is a linear stretch of road between two\n         junctions.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "DrivingDistanceOptions": {
+                    "target": "com.amazonaws.georoutes#WaypointOptimizationDrivingDistanceOptions",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Driving distance options to be used when the clustering algorithm is\n         DrivingDistance.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Options for WaypointOptimizationClustering.</p>"
             }
         },
         "com.amazonaws.georoutes#WaypointOptimizationConnection": {
@@ -10584,7 +10642,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>This contains information such as distance and duration from one waypoint to the next waypoint in the sequence.</p>"
+                "smithy.api#documentation": "<p>This contains information such as distance and duration from one waypoint to the next\n         waypoint in the sequence.</p>"
             }
         },
         "com.amazonaws.georoutes#WaypointOptimizationConnectionList": {
@@ -10656,7 +10714,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Service time spent at the destination. At an appointment, the service time should be the appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Service time spent at the destination. At an appointment, the service time should be the\n         appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "SideOfStreet": {
@@ -10676,7 +10734,7 @@
                 "RestCycles": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationRestCycles",
                     "traits": {
-                        "smithy.api#documentation": "<p>Driver work-rest schedules defined by a short and long cycle. A rest needs to be taken after the short work duration. The short cycle can be repeated until you hit the long work duration, at which point the long rest duration should be taken before restarting.</p>"
+                        "smithy.api#documentation": "<p>Driver work-rest schedules defined by a short and long cycle. A rest needs to be taken\n         after the short work duration. The short cycle can be repeated until you hit the long work\n         duration, at which point the long rest duration should be taken before restarting.</p>"
                     }
                 },
                 "RestProfile": {
@@ -10688,7 +10746,7 @@
                 "TreatServiceTimeAs": {
                     "target": "com.amazonaws.georoutes#WaypointOptimizationServiceTimeTreatment",
                     "traits": {
-                        "smithy.api#documentation": "<p>If the service time provided at a waypoint/destination should be considered as rest or work. This contributes to the total time breakdown returned within the response.</p>"
+                        "smithy.api#documentation": "<p>If the service time provided at a waypoint/destination should be considered as rest or\n         work. This contributes to the total time breakdown returned within the response.</p>"
                     }
                 }
             },
@@ -10696,19 +10754,35 @@
                 "smithy.api#documentation": "<p>Driver related options.</p>"
             }
         },
+        "com.amazonaws.georoutes#WaypointOptimizationDrivingDistanceOptions": {
+            "type": "structure",
+            "members": {
+                "DrivingDistance": {
+                    "target": "com.amazonaws.georoutes#DistanceMeters",
+                    "traits": {
+                        "smithy.api#default": 0,
+                        "smithy.api#documentation": "<p>DrivingDistance assigns all the waypoints that are within driving distance of each other\n         into a single cluster.</p>",
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Driving distance related options.</p>"
+            }
+        },
         "com.amazonaws.georoutes#WaypointOptimizationExclusionOptions": {
             "type": "structure",
             "members": {
                 "Countries": {
                     "target": "com.amazonaws.georoutes#CountryCodeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country codes.</p>",
+                        "smithy.api#documentation": "<p>List of countries to be avoided defined by two-letter or three-letter country\n         codes.</p>",
                         "smithy.api#required": {}
                     }
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Exclusion options.</p>"
+                "smithy.api#documentation": "<p>Specifies strict exclusion options for the route calculation. This setting mandates that\n         the router will avoid any routes that include the specified options, rather than merely\n         attempting to minimize them.</p>"
             }
         },
         "com.amazonaws.georoutes#WaypointOptimizationFailedConstraint": {
@@ -10841,6 +10915,12 @@
                         "smithy.api#documentation": "<p>Estimated time of arrival at the destination.</p>\n         <p>Time format:<code>YYYY-MM-DDThh:mm:ss.sssZ | YYYY-MM-DDThh:mm:ss.sss+hh:mm</code>\n         </p>\n         <p>Examples:</p>\n         <p>\n            <code>2020-04-22T17:57:24Z</code>\n         </p>\n         <p>\n            <code>2020-04-22T17:57:24+02:00</code>\n         </p>"
                     }
                 },
+                "ClusterIndex": {
+                    "target": "com.amazonaws.georoutes#ClusterIndex",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Index of the cluster the waypoint is associated with. The index is included in the response only if clustering was performed while processing the request.</p>"
+                    }
+                },
                 "DepartureTime": {
                     "target": "com.amazonaws.georoutes#TimestampWithTimezoneOffset",
                     "traits": {
@@ -10884,7 +10964,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Options related to the origin.</p>"
+                "smithy.api#documentation": "<p>Origin related options.</p>"
             }
         },
         "com.amazonaws.georoutes#WaypointOptimizationPedestrianOptions": {
@@ -10927,7 +11007,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Driver work-rest schedules defined by a short and long cycle. A rest needs to be taken after the short work duration. The short cycle can be repeated until you hit the long work duration, at which point the long rest duration should be taken before restarting.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                "smithy.api#documentation": "<p>Driver work-rest schedules defined by a short and long cycle. A rest needs to be taken\n         after the short work duration. The short cycle can be repeated until you hit the long work\n         duration, at which point the long rest duration should be taken before restarting.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
             }
         },
         "com.amazonaws.georoutes#WaypointOptimizationRestCycles": {
@@ -11014,7 +11094,7 @@
                 "UseWith": {
                     "target": "com.amazonaws.georoutes#SideOfStreetMatchingStrategy",
                     "traits": {
-                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Strategy that defines when the side of street position should be used. AnyStreet will\n         always use the provided position.</p>\n         <p>Default Value: <code>DividedStreetOnly</code>\n         </p>"
                     }
                 }
             },
@@ -11037,7 +11117,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Service time spent at the destination. At an appointment, the service time should be the appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>",
+                        "smithy.api#documentation": "<p>Service time spent at the destination. At an appointment, the service time should be the\n         appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -11190,14 +11270,14 @@
                 "TunnelRestrictionCode": {
                     "target": "com.amazonaws.georoutes#TunnelRestrictionCode",
                     "traits": {
-                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels in Great Britain. \n         They relate to the types of dangerous goods that can be transported through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>The tunnel restriction code.</p>\n         <p>Tunnel categories in this list indicate the restrictions which apply to certain tunnels\n         in Great Britain. They relate to the types of dangerous goods that can be transported\n         through them.</p>\n         <ul>\n            <li>\n               <p>\n                  <i>Tunnel Category B</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Limited risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Few restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category C</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Medium risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Some restrictions</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category D</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: High risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Many restrictions occur</p>\n                  </li>\n               </ul>\n            </li>\n            <li>\n               <p>\n                  <i>Tunnel Category E</i>\n               </p>\n               <ul>\n                  <li>\n                     <p>\n                        <i>Risk Level</i>: Very high risk</p>\n                  </li>\n                  <li>\n                     <p>\n                        <i>Restrictions</i>: Restricted tunnel</p>\n                  </li>\n               </ul>\n            </li>\n         </ul>"
                     }
                 },
                 "WeightPerAxle": {
                     "target": "com.amazonaws.georoutes#WeightKilograms",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for usage in countries where the differences in axle types or axle groups are not distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Heaviest weight per axle irrespective of the axle type or the axle group. Meant for\n         usage in countries where the differences in axle types or axle groups are not\n         distinguished.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
                     }
                 },
                 "Width": {
@@ -11276,7 +11356,7 @@
                     "target": "com.amazonaws.georoutes#DurationSeconds",
                     "traits": {
                         "smithy.api#default": 0,
-                        "smithy.api#documentation": "<p>Service time spent at the waypoint. At an appointment, the service time should be the appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
+                        "smithy.api#documentation": "<p>Service time spent at the waypoint. At an appointment, the service time should be the\n         appointment duration.</p>\n         <p>\n            <b>Unit</b>: <code>seconds</code>\n         </p>"
                     }
                 },
                 "SideOfStreet": {
@@ -11346,7 +11426,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
+                "smithy.api#documentation": "<p>Specifies the total weight for the specified axle group. Meant for usage in countries\n         that have different regulations based on the axle group type.</p>\n         <p>\n            <b>Unit</b>: <code>Kilograms</code>\n         </p>"
             }
         }
     }
diff --git a/codegen/sdk-codegen/aws-models/rds.json b/codegen/sdk-codegen/aws-models/rds.json
index 0924f5cd5bd..e147a7292aa 100644
--- a/codegen/sdk-codegen/aws-models/rds.json
+++ b/codegen/sdk-codegen/aws-models/rds.json
@@ -4366,7 +4366,7 @@
                 "EnableCloudwatchLogsExports": {
                     "target": "com.amazonaws.rds#LogTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>The list of log types that need to be enabled for exporting to CloudWatch Logs.</p>\n         <p>Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters</p>\n         <p>The following values are valid for each DB engine:</p>\n         <ul>\n            <li>\n               <p>Aurora MySQL - <code>audit | error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>Aurora PostgreSQL - <code>postgresql</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for MySQL - <code>error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for PostgreSQL - <code>postgresql | upgrade</code>\n               </p>\n            </li>\n         </ul>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+                        "smithy.api#documentation": "<p>The list of log types that need to be enabled for exporting to CloudWatch Logs.</p>\n         <p>Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters</p>\n         <p>The following values are valid for each DB engine:</p>\n         <ul>\n            <li>\n               <p>Aurora MySQL - <code>audit | error | general | instance | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>Aurora PostgreSQL - <code>instance | postgresql</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for MySQL - <code>error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for PostgreSQL - <code>postgresql | upgrade</code>\n               </p>\n            </li>\n         </ul>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
                     }
                 },
                 "EngineMode": {
@@ -5304,7 +5304,7 @@
                 "StorageThroughput": {
                     "target": "com.amazonaws.rds#IntegerOptional",
                     "traits": {
-                        "smithy.api#documentation": "<p>The storage throughput value for the DB instance.</p>\n         <p>This setting applies only to the <code>gp3</code> storage type.</p>\n         <p>This setting doesn't apply to Amazon Aurora or RDS Custom DB instances.</p>"
+                        "smithy.api#documentation": "<p>The storage throughput value, in mebibyte per second (MiBps), for the DB instance.</p>\n         <p>This setting applies only to the <code>gp3</code> storage type.</p>\n         <p>This setting doesn't apply to Amazon Aurora or RDS Custom DB instances.</p>"
                     }
                 },
                 "ManageMasterUserPassword": {
@@ -7372,7 +7372,7 @@
                 "CloneGroupId": {
                     "target": "com.amazonaws.rds#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ID of the clone group with which the DB cluster is associated.</p>"
+                        "smithy.api#documentation": "<p>The ID of the clone group with which the DB cluster is associated. For newly created\n            clusters, the ID is typically null. </p>\n         <p>If you clone a DB cluster when the ID is null, the operation populates the ID value\n            for the source cluster and the clone because both clusters become part of the same clone\n            group. Even if you delete the clone cluster, the clone group ID remains for the lifetime\n            of the source cluster to show that it was used in a cloning operation.</p>\n         <p>For PITR, the clone group ID is inherited from the source cluster. For snapshot\n            restore operations, the clone group ID isn't inherited from the source cluster.</p>"
                     }
                 },
                 "ClusterCreateTime": {
@@ -21781,7 +21781,7 @@
                 "CloudwatchLogsExportConfiguration": {
                     "target": "com.amazonaws.rds#CloudwatchLogsExportConfiguration",
                     "traits": {
-                        "smithy.api#documentation": "<p>The configuration setting for the log types to be enabled for export to CloudWatch Logs for a specific DB cluster.</p>\n         <p>Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters</p>\n         <p>The following values are valid for each DB engine:</p>\n         <ul>\n            <li>\n               <p>Aurora MySQL - <code>audit | error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>Aurora PostgreSQL - <code>postgresql</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for MySQL - <code>error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for PostgreSQL - <code>postgresql | upgrade</code>\n               </p>\n            </li>\n         </ul>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">\n                Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+                        "smithy.api#documentation": "<p>The configuration setting for the log types to be enabled for export to CloudWatch Logs for a specific DB cluster.</p>\n         <p>Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters</p>\n         <p>The following values are valid for each DB engine:</p>\n         <ul>\n            <li>\n               <p>Aurora MySQL - <code>audit | error | general | instance | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>Aurora PostgreSQL - <code>instance | postgresql</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for MySQL - <code>error | general | slowquery</code>\n               </p>\n            </li>\n            <li>\n               <p>RDS for PostgreSQL - <code>postgresql | upgrade</code>\n               </p>\n            </li>\n         </ul>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">\n                Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
                     }
                 },
                 "EngineVersion": {
@@ -27138,7 +27138,7 @@
                 "EnableCloudwatchLogsExports": {
                     "target": "com.amazonaws.rds#LogTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to CloudWatch Logs. The values\n            in the list depend on the DB engine being used.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to CloudWatch Logs. The values\n            in the list depend on the DB engine being used.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, <code>instance</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>Aurora PostgreSQL</b>\n         </p>\n         <p>Possible value are <code>instance</code> and <code>postgresql</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>"
                     }
                 },
                 "DeletionProtection": {
@@ -27443,7 +27443,7 @@
                 "EnableCloudwatchLogsExports": {
                     "target": "com.amazonaws.rds#LogTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to Amazon CloudWatch Logs.\n            The values in the list depend on the DB engine being used.</p>\n         <p>\n            <b>RDS for MySQL</b>\n         </p>\n         <p>Possible values are <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>RDS for PostgreSQL</b>\n         </p>\n         <p>Possible values are <code>postgresql</code> and <code>upgrade</code>.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>Aurora PostgreSQL</b>\n         </p>\n         <p>Possible value is <code>postgresql</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>\n         <p>Valid for: Aurora DB clusters and Multi-AZ DB clusters</p>"
+                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to Amazon CloudWatch Logs.\n            The values in the list depend on the DB engine being used.</p>\n         <p>\n            <b>RDS for MySQL</b>\n         </p>\n         <p>Possible values are <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>RDS for PostgreSQL</b>\n         </p>\n         <p>Possible values are <code>postgresql</code> and <code>upgrade</code>.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, <code>instance</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>Aurora PostgreSQL</b>\n         </p>\n         <p>Possible value are <code>instance</code> and <code>postgresql</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>\n         <p>Valid for: Aurora DB clusters and Multi-AZ DB clusters</p>"
                     }
                 },
                 "EngineMode": {
@@ -27796,7 +27796,7 @@
                 "EnableCloudwatchLogsExports": {
                     "target": "com.amazonaws.rds#LogTypeList",
                     "traits": {
-                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to CloudWatch Logs. The values\n            in the list depend on the DB engine being used.</p>\n         <p>\n            <b>RDS for MySQL</b>\n         </p>\n         <p>Possible values are <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>RDS for PostgreSQL</b>\n         </p>\n         <p>Possible values are <code>postgresql</code> and <code>upgrade</code>.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>Aurora PostgreSQL</b>\n         </p>\n         <p>Possible value is <code>postgresql</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>\n         <p>Valid for: Aurora DB clusters and Multi-AZ DB clusters</p>"
+                        "smithy.api#documentation": "<p>The list of logs that the restored DB cluster is to export to CloudWatch Logs. The values\n            in the list depend on the DB engine being used.</p>\n         <p>\n            <b>RDS for MySQL</b>\n         </p>\n         <p>Possible values are <code>error</code>, <code>general</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>RDS for PostgreSQL</b>\n         </p>\n         <p>Possible values are <code>postgresql</code> and <code>upgrade</code>.</p>\n         <p>\n            <b>Aurora MySQL</b>\n         </p>\n         <p>Possible values are <code>audit</code>, <code>error</code>, <code>general</code>, <code>instance</code>, and <code>slowquery</code>.</p>\n         <p>\n            <b>Aurora PostgreSQL</b>\n         </p>\n         <p>Possible value are <code>instance</code> and <code>postgresql</code>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon RDS, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon RDS User Guide</i>.</p>\n         <p>For more information about exporting CloudWatch Logs for Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs</a> in the <i>Amazon Aurora User Guide</i>.</p>\n         <p>Valid for: Aurora DB clusters and Multi-AZ DB clusters</p>"
                     }
                 },
                 "DBClusterParameterGroupName": {
@@ -30505,7 +30505,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Stops an Amazon RDS DB instance. When you stop a DB instance, Amazon RDS retains the DB instance's metadata, including its endpoint, \n            DB parameter group, and option group membership. Amazon RDS also retains the transaction logs so you can do a point-in-time restore if \n            necessary.</p>\n         <p>For more information, see  \n            <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_StopInstance.html\">\n                Stopping an Amazon RDS DB Instance Temporarily</a> in the \n            <i>Amazon RDS User Guide.</i>\n         </p>\n         <note>\n            <p>This command doesn't apply to RDS Custom, Aurora MySQL, and Aurora PostgreSQL.\n            For Aurora clusters, use <code>StopDBCluster</code> instead.</p>\n         </note>",
+                "smithy.api#documentation": "<p>Stops an Amazon RDS DB instance temporarily. When you stop a DB instance, Amazon RDS retains the DB instance's metadata,  \n         including its endpoint, DB parameter group, and option group membership. Amazon RDS also retains\n            the transaction logs so you can do a point-in-time restore if necessary. The instance restarts automatically \n            after 7 days.</p>\n         <p>For more information, see  \n            <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_StopInstance.html\">\n                Stopping an Amazon RDS DB Instance Temporarily</a> in the \n            <i>Amazon RDS User Guide.</i>\n         </p>\n         <note>\n            <p>This command doesn't apply to RDS Custom, Aurora MySQL, and Aurora PostgreSQL.\n            For Aurora clusters, use <code>StopDBCluster</code> instead.</p>\n         </note>",
                 "smithy.api#examples": [
                     {
                         "title": "To stop a DB instance",
diff --git a/codegen/sdk-codegen/aws-models/sagemaker.json b/codegen/sdk-codegen/aws-models/sagemaker.json
index e2beec9f869..33f4f466c35 100644
--- a/codegen/sdk-codegen/aws-models/sagemaker.json
+++ b/codegen/sdk-codegen/aws-models/sagemaker.json
@@ -56915,6 +56915,12 @@
                         "smithy.api#enumValue": "ml.p5e.48xlarge"
                     }
                 },
+                "ML_P5EN_48XLARGE": {
+                    "target": "smithy.api#Unit",
+                    "traits": {
+                        "smithy.api#enumValue": "ml.p5en.48xlarge"
+                    }
+                },
                 "ML_M7I_LARGE": {
                     "target": "smithy.api#Unit",
                     "traits": {
@@ -60202,7 +60208,7 @@
                 "SageMakerImageVersionArn": {
                     "target": "com.amazonaws.sagemaker#ImageVersionArn",
                     "traits": {
-                        "smithy.api#documentation": "<p>The ARN of the image version created on the instance.</p>"
+                        "smithy.api#documentation": "<p>The ARN of the image version created on the instance. To clear the value set for <code>SageMakerImageVersionArn</code>, pass <code>None</code> as the value.</p>"
                     }
                 },
                 "SageMakerImageVersionAlias": {
@@ -60225,7 +60231,7 @@
                 }
             },
             "traits": {
-                "smithy.api#documentation": "<p>Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and the instance type that\n         the version runs on.</p>"
+                "smithy.api#documentation": "<p>Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and the instance type that\n         the version runs on.</p>\n         <note>\n            <p>When both <code>SageMakerImageVersionArn</code> and <code>SageMakerImageArn</code> are passed, <code>SageMakerImageVersionArn</code> is used. Any updates to <code>SageMakerImageArn</code> will not take effect if <code>SageMakerImageVersionArn</code> already exists in the <code>ResourceSpec</code> because <code>SageMakerImageVersionArn</code> always takes precedence. To clear the value set for <code>SageMakerImageVersionArn</code>, pass <code>None</code> as the value.</p>\n         </note>"
             }
         },
         "com.amazonaws.sagemaker#ResourceType": {
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters.java
index 5d011ec6342..ad33f50dac2 100644
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters.java
+++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters.java
@@ -22,9 +22,7 @@
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.go.codegen.GoCodegenContext;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
-import software.amazon.smithy.go.codegen.integration.Waiters;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.go.codegen.integration.Waiters2;
 
 import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;
 import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
@@ -32,22 +30,16 @@
 /**
  * Extends the base smithy Waiters integration to track in the User-Agent string.
  */
-public class AwsWaiters extends Waiters {
+public class AwsWaiters extends Waiters2 {
     @Override
     public Set<Symbol> getAdditionalClientOptions() {
         return Set.of(buildPackageSymbol("addIsWaiterUserAgent"));
     }
 
-    @Override
-    public boolean enabledForService(Model model, ShapeId service) {
-        return !AwsWaiters2.PHASED_ROLLOUT_SERVICES.contains(service);
-    }
-
     @Override
     public void writeAdditionalFiles(GoCodegenContext ctx) {
         super.writeAdditionalFiles(ctx);
 
-        // happens regardless of enabledForService() == true - so AwsWaiters2 can use it
         ctx.writerDelegator().useFileWriter("api_client.go", ctx.settings().getModuleName(), goTemplate("""
                 func addIsWaiterUserAgent(o *Options) {
                     o.APIOptions = append(o.APIOptions, func(stack $stack:P) error {
diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters2.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters2.java
deleted file mode 100644
index 80cd1190ec1..00000000000
--- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/customization/AwsWaiters2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package software.amazon.smithy.aws.go.codegen.customization;
-
-import software.amazon.smithy.codegen.core.Symbol;
-import software.amazon.smithy.go.codegen.integration.Waiters2;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.ShapeId;
-
-import java.util.List;
-import java.util.Set;
-
-import static software.amazon.smithy.go.codegen.SymbolUtils.buildPackageSymbol;
-
-public class AwsWaiters2 extends Waiters2 {
-    public static final List<ShapeId> PHASED_ROLLOUT_SERVICES = List.of(
-            ShapeId.from("com.amazonaws.ec2#AmazonEC2"),
-            ShapeId.from("com.amazonaws.autoscaling#AutoScaling_2011_01_01"),
-            ShapeId.from("com.amazonaws.cloudwatch#GraniteServiceVersion20100801")
-    );
-
-    @Override
-    public Set<Symbol> getAdditionalClientOptions() {
-        return Set.of(buildPackageSymbol("addIsWaiterUserAgent"));
-    }
-
-    @Override
-    public boolean enabledForService(Model model, ShapeId service) {
-        return PHASED_ROLLOUT_SERVICES.contains(service);
-    }
-}
diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
index bc78b9d68d7..5d68fdd4c27 100644
--- a/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
+++ b/codegen/smithy-aws-go-codegen/src/main/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
@@ -1,5 +1,4 @@
 software.amazon.smithy.aws.go.codegen.customization.AwsWaiters
-software.amazon.smithy.aws.go.codegen.customization.AwsWaiters2
 software.amazon.smithy.aws.go.codegen.customization.AwsPaginators
 software.amazon.smithy.aws.go.codegen.customization.auth.BackfillSigV4ATrait
 software.amazon.smithy.aws.go.codegen.AddProtocols
diff --git a/config/CHANGELOG.md b/config/CHANGELOG.md
index c800a2862ea..467de6d1831 100644
--- a/config/CHANGELOG.md
+++ b/config/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/config/go.mod b/config/go.mod
index 88ffda45818..42db005e260 100644
--- a/config/go.mod
+++ b/config/go.mod
@@ -3,21 +3,21 @@ module github.com/aws/aws-sdk-go-v2/config
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../
diff --git a/config/go_module_metadata.go b/config/go_module_metadata.go
index f9440e2f7f5..f7efdbafa7d 100644
--- a/config/go_module_metadata.go
+++ b/config/go_module_metadata.go
@@ -3,4 +3,4 @@
 package config
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.3"
+const goModuleVersion = "1.29.4"
diff --git a/credentials/CHANGELOG.md b/credentials/CHANGELOG.md
index 88a64874a3b..f5edd4a05b7 100644
--- a/credentials/CHANGELOG.md
+++ b/credentials/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.17.57 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.56 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/credentials/go.mod b/credentials/go.mod
index c1f66ac9e2d..f6d690cd228 100644
--- a/credentials/go.mod
+++ b/credentials/go.mod
@@ -3,19 +3,19 @@ module github.com/aws/aws-sdk-go-v2/credentials
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../
diff --git a/credentials/go_module_metadata.go b/credentials/go_module_metadata.go
index c3e1d872d65..f20e67c4d43 100644
--- a/credentials/go_module_metadata.go
+++ b/credentials/go_module_metadata.go
@@ -3,4 +3,4 @@
 package credentials
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.56"
+const goModuleVersion = "1.17.57"
diff --git a/example/service/dynamodb/createTable/go.mod b/example/service/dynamodb/createTable/go.mod
index 74fbdccad0c..be09fcfaf14 100644
--- a/example/service/dynamodb/createTable/go.mod
+++ b/example/service/dynamodb/createTable/go.mod
@@ -3,25 +3,24 @@ module github.com/aws/aws-sdk-go-v2/example/service/dynamodb/createTable
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../
diff --git a/example/service/dynamodb/createTable/go.sum b/example/service/dynamodb/createTable/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/example/service/dynamodb/createTable/go.sum
+++ b/example/service/dynamodb/createTable/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/example/service/dynamodb/scanItems/go.mod b/example/service/dynamodb/scanItems/go.mod
index 48add44d76e..12168fd11a1 100644
--- a/example/service/dynamodb/scanItems/go.mod
+++ b/example/service/dynamodb/scanItems/go.mod
@@ -3,27 +3,26 @@ module github.com/aws/aws-sdk-go-v2/example/service/dynamodb/listItems
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.17.0
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.18.0
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.18 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../
diff --git a/example/service/dynamodb/scanItems/go.sum b/example/service/dynamodb/scanItems/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/example/service/dynamodb/scanItems/go.sum
+++ b/example/service/dynamodb/scanItems/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/example/service/s3/listObjects/go.mod b/example/service/s3/listObjects/go.mod
index 8e585ba7e86..49ab140ef41 100644
--- a/example/service/s3/listObjects/go.mod
+++ b/example/service/s3/listObjects/go.mod
@@ -3,26 +3,26 @@ module github.com/aws/aws-sdk-go-v2/example/service/s3/listObjects
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.1
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 )
 
diff --git a/example/service/s3/usingPrivateLink/go.mod b/example/service/s3/usingPrivateLink/go.mod
index 355c972194f..d62822f64bf 100644
--- a/example/service/s3/usingPrivateLink/go.mod
+++ b/example/service/s3/usingPrivateLink/go.mod
@@ -3,27 +3,27 @@ module github.com/aws/aws-sdk-go-v2/example/service/s3/usingPrivateLink
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.1
-	github.com/aws/aws-sdk-go-v2/service/s3control v1.53.1
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
+	github.com/aws/aws-sdk-go-v2/service/s3control v1.53.2
 )
 
 require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 )
 
diff --git a/feature/cloudfront/sign/CHANGELOG.md b/feature/cloudfront/sign/CHANGELOG.md
index 522df49d0ef..8c33e95f28a 100644
--- a/feature/cloudfront/sign/CHANGELOG.md
+++ b/feature/cloudfront/sign/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/feature/cloudfront/sign/go.mod b/feature/cloudfront/sign/go.mod
index ad8c8b4d39e..9b4b04f5c13 100644
--- a/feature/cloudfront/sign/go.mod
+++ b/feature/cloudfront/sign/go.mod
@@ -2,7 +2,7 @@ module github.com/aws/aws-sdk-go-v2/feature/cloudfront/sign
 
 go 1.21
 
-require github.com/aws/aws-sdk-go-v2 v1.35.0
+require github.com/aws/aws-sdk-go-v2 v1.36.0
 
 require github.com/aws/smithy-go v1.22.2 // indirect
 
diff --git a/feature/cloudfront/sign/go_module_metadata.go b/feature/cloudfront/sign/go_module_metadata.go
index a3511f55072..2e0d62f261c 100644
--- a/feature/cloudfront/sign/go_module_metadata.go
+++ b/feature/cloudfront/sign/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sign
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.7"
+const goModuleVersion = "1.8.8"
diff --git a/feature/dsql/auth/CHANGELOG.md b/feature/dsql/auth/CHANGELOG.md
index a603349f25e..225af547636 100644
--- a/feature/dsql/auth/CHANGELOG.md
+++ b/feature/dsql/auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/feature/dsql/auth/go.mod b/feature/dsql/auth/go.mod
index 4ee062b8b3a..d1c2e2d3c83 100644
--- a/feature/dsql/auth/go.mod
+++ b/feature/dsql/auth/go.mod
@@ -2,7 +2,7 @@ module github.com/aws/aws-sdk-go-v2/feature/dsql/auth
 
 go 1.21
 
-require github.com/aws/aws-sdk-go-v2 v1.35.0
+require github.com/aws/aws-sdk-go-v2 v1.36.0
 
 require github.com/aws/smithy-go v1.22.2 // indirect
 
diff --git a/feature/dsql/auth/go_module_metadata.go b/feature/dsql/auth/go_module_metadata.go
index e4aecf0ebac..fb29909c604 100644
--- a/feature/dsql/auth/go_module_metadata.go
+++ b/feature/dsql/auth/go_module_metadata.go
@@ -3,4 +3,4 @@
 package auth
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.5"
+const goModuleVersion = "1.0.6"
diff --git a/feature/dynamodb/attributevalue/CHANGELOG.md b/feature/dynamodb/attributevalue/CHANGELOG.md
index 1589633f030..ec62f978530 100644
--- a/feature/dynamodb/attributevalue/CHANGELOG.md
+++ b/feature/dynamodb/attributevalue/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.18.0 (2025-01-31)
+
+* **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.0 (2025-01-30)
 
 * **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
diff --git a/feature/dynamodb/attributevalue/go.mod b/feature/dynamodb/attributevalue/go.mod
index e2fbc7595c5..9cbfbe6f07d 100644
--- a/feature/dynamodb/attributevalue/go.mod
+++ b/feature/dynamodb/attributevalue/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
-	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.17
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.18
 )
 
 require github.com/aws/smithy-go v1.22.2 // indirect
diff --git a/feature/dynamodb/attributevalue/go_module_metadata.go b/feature/dynamodb/attributevalue/go_module_metadata.go
index f4f17afa319..5dd8bb6df99 100644
--- a/feature/dynamodb/attributevalue/go_module_metadata.go
+++ b/feature/dynamodb/attributevalue/go_module_metadata.go
@@ -3,4 +3,4 @@
 package attributevalue
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.0"
+const goModuleVersion = "1.18.0"
diff --git a/feature/dynamodb/expression/CHANGELOG.md b/feature/dynamodb/expression/CHANGELOG.md
index 6f38a131594..785b93bc974 100644
--- a/feature/dynamodb/expression/CHANGELOG.md
+++ b/feature/dynamodb/expression/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.7.66 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.65 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/feature/dynamodb/expression/go.mod b/feature/dynamodb/expression/go.mod
index 81335ceb4f4..88904b59ba2 100644
--- a/feature/dynamodb/expression/go.mod
+++ b/feature/dynamodb/expression/go.mod
@@ -3,19 +3,18 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.17.0
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.18.0
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.18 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../
diff --git a/feature/dynamodb/expression/go.sum b/feature/dynamodb/expression/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/feature/dynamodb/expression/go.sum
+++ b/feature/dynamodb/expression/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/feature/dynamodb/expression/go_module_metadata.go b/feature/dynamodb/expression/go_module_metadata.go
index 0865cab9bea..59b6e02474b 100644
--- a/feature/dynamodb/expression/go_module_metadata.go
+++ b/feature/dynamodb/expression/go_module_metadata.go
@@ -3,4 +3,4 @@
 package expression
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.65"
+const goModuleVersion = "1.7.66"
diff --git a/feature/dynamodbstreams/attributevalue/CHANGELOG.md b/feature/dynamodbstreams/attributevalue/CHANGELOG.md
index c3153264ea1..31a3ee46659 100644
--- a/feature/dynamodbstreams/attributevalue/CHANGELOG.md
+++ b/feature/dynamodbstreams/attributevalue/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.17.0 (2025-01-31)
+
+* **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.0 (2025-01-30)
 
 * **Feature**: Add FixUnmarshalIndividualSetValues option to DecoderOptions to fix unmarshalling of individual values of StringSet, NumberSet, and BinarySet attributes.
diff --git a/feature/dynamodbstreams/attributevalue/go.mod b/feature/dynamodbstreams/attributevalue/go.mod
index e5fad6a4962..30c2bbe48c3 100644
--- a/feature/dynamodbstreams/attributevalue/go.mod
+++ b/feature/dynamodbstreams/attributevalue/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/feature/dynamodbstreams/attributevalue
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
-	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.17
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.18
 )
 
 require github.com/aws/smithy-go v1.22.2 // indirect
diff --git a/feature/dynamodbstreams/attributevalue/go_module_metadata.go b/feature/dynamodbstreams/attributevalue/go_module_metadata.go
index 227dd17fd96..f4f17afa319 100644
--- a/feature/dynamodbstreams/attributevalue/go_module_metadata.go
+++ b/feature/dynamodbstreams/attributevalue/go_module_metadata.go
@@ -3,4 +3,4 @@
 package attributevalue
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.0"
+const goModuleVersion = "1.17.0"
diff --git a/feature/ec2/imds/CHANGELOG.md b/feature/ec2/imds/CHANGELOG.md
index c4d98518279..d90cc27bd62 100644
--- a/feature/ec2/imds/CHANGELOG.md
+++ b/feature/ec2/imds/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.27 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.26 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/feature/ec2/imds/go.mod b/feature/ec2/imds/go.mod
index 12150a448b9..e13fd3ef3e5 100644
--- a/feature/ec2/imds/go.mod
+++ b/feature/ec2/imds/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/feature/ec2/imds
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/feature/ec2/imds/go_module_metadata.go b/feature/ec2/imds/go_module_metadata.go
index 5bff57d6507..94f576aa315 100644
--- a/feature/ec2/imds/go_module_metadata.go
+++ b/feature/ec2/imds/go_module_metadata.go
@@ -3,4 +3,4 @@
 package imds
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.26"
+const goModuleVersion = "1.16.27"
diff --git a/feature/ec2/imds/internal/configtesting/go.mod b/feature/ec2/imds/internal/configtesting/go.mod
index d6b57e0374f..5cf87b9eb3c 100644
--- a/feature/ec2/imds/internal/configtesting/go.mod
+++ b/feature/ec2/imds/internal/configtesting/go.mod
@@ -3,21 +3,21 @@ module github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/configtesting
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 )
 
diff --git a/feature/rds/auth/CHANGELOG.md b/feature/rds/auth/CHANGELOG.md
index 9689ee8c01b..a3b77afc9ec 100644
--- a/feature/rds/auth/CHANGELOG.md
+++ b/feature/rds/auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.5.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.5.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/feature/rds/auth/go.mod b/feature/rds/auth/go.mod
index cfc21b41b48..7551b4cbff5 100644
--- a/feature/rds/auth/go.mod
+++ b/feature/rds/auth/go.mod
@@ -2,7 +2,7 @@ module github.com/aws/aws-sdk-go-v2/feature/rds/auth
 
 go 1.21
 
-require github.com/aws/aws-sdk-go-v2 v1.35.0
+require github.com/aws/aws-sdk-go-v2 v1.36.0
 
 require github.com/aws/smithy-go v1.22.2 // indirect
 
diff --git a/feature/rds/auth/go_module_metadata.go b/feature/rds/auth/go_module_metadata.go
index f27114c6f92..9b7198f9651 100644
--- a/feature/rds/auth/go_module_metadata.go
+++ b/feature/rds/auth/go_module_metadata.go
@@ -3,4 +3,4 @@
 package auth
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.5.6"
+const goModuleVersion = "1.5.7"
diff --git a/feature/s3/manager/CHANGELOG.md b/feature/s3/manager/CHANGELOG.md
index bcbca08fd2a..6a4fa28e9cc 100644
--- a/feature/s3/manager/CHANGELOG.md
+++ b/feature/s3/manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.17.57 (2025-01-31)
+
+* **Bug Fix**: Fix incorrect reference to old s3manager in comments.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.56 (2025-01-30)
 
 * **Bug Fix**: Fix incorrect reference to old s3manager in comments.
diff --git a/feature/s3/manager/go.mod b/feature/s3/manager/go.mod
index cda3b4347ae..7c06b4c3d2e 100644
--- a/feature/s3/manager/go.mod
+++ b/feature/s3/manager/go.mod
@@ -3,27 +3,27 @@ module github.com/aws/aws-sdk-go-v2/feature/s3/manager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.1
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../
diff --git a/feature/s3/manager/go_module_metadata.go b/feature/s3/manager/go_module_metadata.go
index f023a8d7f16..e6ea82bff5a 100644
--- a/feature/s3/manager/go_module_metadata.go
+++ b/feature/s3/manager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package manager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.56"
+const goModuleVersion = "1.17.57"
diff --git a/feature/s3/transfermanager/LICENSE.txt b/feature/s3/transfermanager/LICENSE.txt
new file mode 100644
index 00000000000..d6456956733
--- /dev/null
+++ b/feature/s3/transfermanager/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/feature/s3/transfermanager/api.go b/feature/s3/transfermanager/api.go
new file mode 100644
index 00000000000..dbe430dadb4
--- /dev/null
+++ b/feature/s3/transfermanager/api.go
@@ -0,0 +1,16 @@
+package transfermanager
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+)
+
+// S3APIClient defines an interface doing S3 client side operations for transfer manager
+type S3APIClient interface {
+	PutObject(context.Context, *s3.PutObjectInput, ...func(*s3.Options)) (*s3.PutObjectOutput, error)
+	UploadPart(context.Context, *s3.UploadPartInput, ...func(*s3.Options)) (*s3.UploadPartOutput, error)
+	CreateMultipartUpload(context.Context, *s3.CreateMultipartUploadInput, ...func(*s3.Options)) (*s3.CreateMultipartUploadOutput, error)
+	CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput, ...func(*s3.Options)) (*s3.CompleteMultipartUploadOutput, error)
+	AbortMultipartUpload(context.Context, *s3.AbortMultipartUploadInput, ...func(*s3.Options)) (*s3.AbortMultipartUploadOutput, error)
+}
diff --git a/feature/s3/transfermanager/api_client.go b/feature/s3/transfermanager/api_client.go
new file mode 100644
index 00000000000..84ce16db425
--- /dev/null
+++ b/feature/s3/transfermanager/api_client.go
@@ -0,0 +1,51 @@
+package transfermanager
+
+import (
+	"github.com/aws/aws-sdk-go-v2/aws"
+)
+
+const userAgentKey = "s3-transfer"
+
+// defaultMaxUploadParts is the maximum allowed number of parts in a multi-part upload
+// on Amazon S3.
+const defaultMaxUploadParts = 10000
+
+// defaultPartSizeBytes is the default part size when transferring objects to/from S3
+const minPartSizeBytes = 1024 * 1024 * 8
+
+// defaultMultipartUploadThreshold is the default size threshold in bytes indicating when to use multipart upload.
+const defaultMultipartUploadThreshold = 1024 * 1024 * 16
+
+// defaultTransferConcurrency is the default number of goroutines to spin up when
+// using PutObject().
+const defaultTransferConcurrency = 5
+
+// Client provides the API client to make operations call for Amazon Simple
+// Storage Service's Transfer Manager
+// It is safe to call Client methods concurrently across goroutines.
+type Client struct {
+	options Options
+}
+
+// New returns an initialized Client from the client Options. Provide
+// more functional options to further configure the Client
+func New(s3Client S3APIClient, opts Options, optFns ...func(*Options)) *Client {
+	opts.S3 = s3Client
+	for _, fn := range optFns {
+		fn(&opts)
+	}
+
+	resolveConcurrency(&opts)
+	resolvePartSizeBytes(&opts)
+	resolveChecksumAlgorithm(&opts)
+	resolveMultipartUploadThreshold(&opts)
+
+	return &Client{
+		options: opts,
+	}
+}
+
+// NewFromConfig returns a new Client from the provided s3 config
+func NewFromConfig(s3Client S3APIClient, cfg aws.Config, optFns ...func(*Options)) *Client {
+	return New(s3Client, Options{}, optFns...)
+}
diff --git a/feature/s3/transfermanager/api_op_PutObject.go b/feature/s3/transfermanager/api_op_PutObject.go
new file mode 100644
index 00000000000..0785ec4e81e
--- /dev/null
+++ b/feature/s3/transfermanager/api_op_PutObject.go
@@ -0,0 +1,992 @@
+package transfermanager
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"sort"
+	"sync"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/middleware"
+	"github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager/types"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+	smithymiddleware "github.com/aws/smithy-go/middleware"
+)
+
+// A MultipartUploadError wraps a failed S3 multipart upload. An error returned
+// will satisfy this interface when a multi part upload failed to upload all
+// chucks to S3. In the case of a failure the UploadID is needed to operate on
+// the chunks, if any, which were uploaded.
+//
+// Example:
+//
+//	c := transfermanager.New(client, opts)
+//	output, err := c.PutObject(context.Background(), input)
+//	if err != nil {
+//		var multierr transfermanager.MultipartUploadError
+//		if errors.As(err, &multierr) {
+//			fmt.Printf("upload failure UploadID=%s, %s\n", multierr.UploadID(), multierr.Error())
+//		} else {
+//			fmt.Printf("upload failure, %s\n", err.Error())
+//		}
+//	}
+type MultipartUploadError interface {
+	error
+
+	// UploadID returns the upload id for the S3 multipart upload that failed.
+	UploadID() string
+}
+
+// A multipartUploadError wraps the upload ID of a failed s3 multipart upload.
+// Composed of BaseError for code, message, and original error
+//
+// Should be used for an error that occurred failing a S3 multipart upload,
+// and a upload ID is available.
+type multipartUploadError struct {
+	err error
+
+	// ID for multipart upload which failed.
+	uploadID string
+}
+
+// Error returns the string representation of the error.
+//
+// Satisfies the error interface.
+func (m *multipartUploadError) Error() string {
+	var extra string
+	if m.err != nil {
+		extra = fmt.Sprintf(", cause: %s", m.err.Error())
+	}
+	return fmt.Sprintf("upload multipart failed, upload id: %s%s", m.uploadID, extra)
+}
+
+// Unwrap returns the underlying error that cause the upload failure
+func (m *multipartUploadError) Unwrap() error {
+	return m.err
+}
+
+// UploadID returns the id of the S3 upload which failed.
+func (m *multipartUploadError) UploadID() string {
+	return m.uploadID
+}
+
+// PutObjectInput represents a request to the PutObject() call. It contains common fields
+// of s3 PutObject and CreateMultipartUpload input
+type PutObjectInput struct {
+	// Bucket the object is uploaded into
+	Bucket string
+
+	// Object key for which the PUT action was initiated
+	Key string
+
+	// Object data
+	Body io.Reader
+
+	// The canned ACL to apply to the object. For more information, see [Canned ACL] in the Amazon
+	// S3 User Guide.
+	//
+	// When adding a new object, you can use headers to grant ACL-based permissions to
+	// individual Amazon Web Services accounts or to predefined groups defined by
+	// Amazon S3. These permissions are then added to the ACL on the object. By
+	// default, all objects are private. Only the owner has full access control. For
+	// more information, see [Access Control List (ACL) Overview]and [Managing ACLs Using the REST API] in the Amazon S3 User Guide.
+	//
+	// If the bucket that you're uploading objects to uses the bucket owner enforced
+	// setting for S3 Object Ownership, ACLs are disabled and no longer affect
+	// permissions. Buckets that use this setting only accept PUT requests that don't
+	// specify an ACL or PUT requests that specify bucket owner full control ACLs, such
+	// as the bucket-owner-full-control canned ACL or an equivalent form of this ACL
+	// expressed in the XML format. PUT requests that contain other ACLs (for example,
+	// custom grants to certain Amazon Web Services accounts) fail and return a 400
+	// error with the error code AccessControlListNotSupported . For more information,
+	// see [Controlling ownership of objects and disabling ACLs]in the Amazon S3 User Guide.
+	//
+	//   - This functionality is not supported for directory buckets.
+	//
+	//   - This functionality is not supported for Amazon S3 on Outposts.
+	//
+	// [Managing ACLs Using the REST API]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-using-rest-api.html
+	// [Access Control List (ACL) Overview]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html
+	// [Canned ACL]: https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL
+	// [Controlling ownership of objects and disabling ACLs]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html
+	ACL types.ObjectCannedACL
+
+	// Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption
+	// with server-side encryption using Key Management Service (KMS) keys (SSE-KMS).
+	// Setting this header to true causes Amazon S3 to use an S3 Bucket Key for object
+	// encryption with SSE-KMS.
+	//
+	// Specifying this header with a PUT action doesn’t affect bucket-level settings
+	// for S3 Bucket Key.
+	//
+	// This functionality is not supported for directory buckets.
+	BucketKeyEnabled bool
+
+	// Can be used to specify caching behavior along the request/reply chain. For more
+	// information, see [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9].
+	//
+	// [http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	CacheControl string
+
+	// Indicates the algorithm used to create the checksum for the object when you use
+	// the SDK. This header will not provide any additional functionality if you don't
+	// use the SDK. When you send this header, there must be a corresponding
+	// x-amz-checksum-algorithm or x-amz-trailer header sent. Otherwise, Amazon S3
+	// fails the request with the HTTP status code 400 Bad Request .
+	//
+	// For the x-amz-checksum-algorithm  header, replace  algorithm  with the
+	// supported algorithm from the following list:
+	//
+	//   - CRC32
+	//
+	//   - CRC32C
+	//
+	//   - SHA1
+	//
+	//   - SHA256
+	//
+	// For more information, see [Checking object integrity] in the Amazon S3 User Guide.
+	//
+	// If the individual checksum value you provide through x-amz-checksum-algorithm
+	// doesn't match the checksum algorithm you set through
+	// x-amz-sdk-checksum-algorithm , Amazon S3 ignores any provided ChecksumAlgorithm
+	// parameter and uses the checksum algorithm that matches the provided value in
+	// x-amz-checksum-algorithm .
+	//
+	// For directory buckets, when you use Amazon Web Services SDKs, CRC32 is the
+	// default checksum algorithm that's used for performance.
+	//
+	// [Checking object integrity]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html
+	ChecksumAlgorithm types.ChecksumAlgorithm
+
+	// Size of the body in bytes. This parameter is useful when the size of the body
+	// cannot be determined automatically. For more information, see [https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length].
+	//
+	// [https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length]: https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length
+	ContentLength int64
+
+	// Specifies presentational information for the object. For more information, see [https://www.rfc-editor.org/rfc/rfc6266#section-4].
+	//
+	// [https://www.rfc-editor.org/rfc/rfc6266#section-4]: https://www.rfc-editor.org/rfc/rfc6266#section-4
+	ContentDisposition string
+
+	// Specifies what content encodings have been applied to the object and thus what
+	// decoding mechanisms must be applied to obtain the media-type referenced by the
+	// Content-Type header field. For more information, see [https://www.rfc-editor.org/rfc/rfc9110.html#field.content-encoding].
+	//
+	// [https://www.rfc-editor.org/rfc/rfc9110.html#field.content-encoding]: https://www.rfc-editor.org/rfc/rfc9110.html#field.content-encoding
+	ContentEncoding string
+
+	// The language the content is in.
+	ContentLanguage string
+
+	// A standard MIME type describing the format of the contents. For more
+	// information, see [https://www.rfc-editor.org/rfc/rfc9110.html#name-content-type].
+	//
+	// [https://www.rfc-editor.org/rfc/rfc9110.html#name-content-type]: https://www.rfc-editor.org/rfc/rfc9110.html#name-content-type
+	ContentType string
+
+	// The account ID of the expected bucket owner. If the account ID that you provide
+	// does not match the actual owner of the bucket, the request fails with the HTTP
+	// status code 403 Forbidden (access denied).
+	ExpectedBucketOwner string
+
+	// The date and time at which the object is no longer cacheable. For more
+	// information, see [https://www.rfc-editor.org/rfc/rfc7234#section-5.3].
+	//
+	// [https://www.rfc-editor.org/rfc/rfc7234#section-5.3]: https://www.rfc-editor.org/rfc/rfc7234#section-5.3
+	Expires time.Time
+
+	// Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
+	//
+	//   - This functionality is not supported for directory buckets.
+	//
+	//   - This functionality is not supported for Amazon S3 on Outposts.
+	GrantFullControl string
+
+	// Allows grantee to read the object data and its metadata.
+	//
+	//   - This functionality is not supported for directory buckets.
+	//
+	//   - This functionality is not supported for Amazon S3 on Outposts.
+	GrantRead string
+
+	// Allows grantee to read the object ACL.
+	//
+	//   - This functionality is not supported for directory buckets.
+	//
+	//   - This functionality is not supported for Amazon S3 on Outposts.
+	GrantReadACP string
+
+	// Allows grantee to write the ACL for the applicable object.
+	//
+	//   - This functionality is not supported for directory buckets.
+	//
+	//   - This functionality is not supported for Amazon S3 on Outposts.
+	GrantWriteACP string
+
+	// A map of metadata to store with the object in S3.
+	Metadata map[string]string
+
+	// Specifies whether a legal hold will be applied to this object. For more
+	// information about S3 Object Lock, see [Object Lock]in the Amazon S3 User Guide.
+	//
+	// This functionality is not supported for directory buckets.
+	//
+	// [Object Lock]: https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html
+	ObjectLockLegalHoldStatus types.ObjectLockLegalHoldStatus
+
+	// The Object Lock mode that you want to apply to this object.
+	//
+	// This functionality is not supported for directory buckets.
+	ObjectLockMode types.ObjectLockMode
+
+	// The date and time when you want this object's Object Lock to expire. Must be
+	// formatted as a timestamp parameter.
+	//
+	// This functionality is not supported for directory buckets.
+	ObjectLockRetainUntilDate time.Time
+
+	// Confirms that the requester knows that they will be charged for the request.
+	// Bucket owners need not specify this parameter in their requests. If either the
+	// source or destination S3 bucket has Requester Pays enabled, the requester will
+	// pay for corresponding charges to copy the object. For information about
+	// downloading objects from Requester Pays buckets, see [Downloading Objects in Requester Pays Buckets]in the Amazon S3 User
+	// Guide.
+	//
+	// This functionality is not supported for directory buckets.
+	//
+	// [Downloading Objects in Requester Pays Buckets]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+	RequestPayer types.RequestPayer
+
+	// Specifies the algorithm to use when encrypting the object (for example, AES256 ).
+	//
+	// This functionality is not supported for directory buckets.
+	SSECustomerAlgorithm string
+
+	// Specifies the customer-provided encryption key for Amazon S3 to use in
+	// encrypting data. This value is used to store the object and then it is
+	// discarded; Amazon S3 does not store the encryption key. The key must be
+	// appropriate for use with the algorithm specified in the
+	// x-amz-server-side-encryption-customer-algorithm header.
+	//
+	// This functionality is not supported for directory buckets.
+	SSECustomerKey string
+
+	// Specifies the Amazon Web Services KMS Encryption Context to use for object
+	// encryption. The value of this header is a base64-encoded UTF-8 string holding
+	// JSON with the encryption context key-value pairs. This value is stored as object
+	// metadata and automatically gets passed on to Amazon Web Services KMS for future
+	// GetObject or CopyObject operations on this object. This value must be
+	// explicitly added during CopyObject operations.
+	//
+	// This functionality is not supported for directory buckets.
+	SSEKMSEncryptionContext string
+
+	// If x-amz-server-side-encryption has a valid value of aws:kms or aws:kms:dsse ,
+	// this header specifies the ID (Key ID, Key ARN, or Key Alias) of the Key
+	// Management Service (KMS) symmetric encryption customer managed key that was used
+	// for the object. If you specify x-amz-server-side-encryption:aws:kms or
+	// x-amz-server-side-encryption:aws:kms:dsse , but do not provide
+	// x-amz-server-side-encryption-aws-kms-key-id , Amazon S3 uses the Amazon Web
+	// Services managed key ( aws/s3 ) to protect the data. If the KMS key does not
+	// exist in the same account that's issuing the command, you must use the full ARN
+	// and not just the ID.
+	//
+	// This functionality is not supported for directory buckets.
+	SSEKMSKeyID string
+
+	// The server-side encryption algorithm that was used when you store this object
+	// in Amazon S3 (for example, AES256 , aws:kms , aws:kms:dsse ).
+	//
+	// General purpose buckets - You have four mutually exclusive options to protect
+	// data using server-side encryption in Amazon S3, depending on how you choose to
+	// manage the encryption keys. Specifically, the encryption key options are Amazon
+	// S3 managed keys (SSE-S3), Amazon Web Services KMS keys (SSE-KMS or DSSE-KMS),
+	// and customer-provided keys (SSE-C). Amazon S3 encrypts data with server-side
+	// encryption by using Amazon S3 managed keys (SSE-S3) by default. You can
+	// optionally tell Amazon S3 to encrypt data at rest by using server-side
+	// encryption with other key options. For more information, see [Using Server-Side Encryption]in the Amazon S3
+	// User Guide.
+	//
+	// Directory buckets - For directory buckets, only the server-side encryption with
+	// Amazon S3 managed keys (SSE-S3) ( AES256 ) value is supported.
+	//
+	// [Using Server-Side Encryption]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html
+	ServerSideEncryption types.ServerSideEncryption
+
+	// By default, Amazon S3 uses the STANDARD Storage Class to store newly created
+	// objects. The STANDARD storage class provides high durability and high
+	// availability. Depending on performance needs, you can specify a different
+	// Storage Class. For more information, see [Storage Classes]in the Amazon S3 User Guide.
+	//
+	//   - For directory buckets, only the S3 Express One Zone storage class is
+	//   supported to store newly created objects.
+	//
+	//   - Amazon S3 on Outposts only uses the OUTPOSTS Storage Class.
+	//
+	// [Storage Classes]: https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html
+	StorageClass types.StorageClass
+
+	// The tag-set for the object. The tag-set must be encoded as URL Query
+	// parameters. (For example, "Key1=Value1")
+	//
+	// This functionality is not supported for directory buckets.
+	Tagging string
+
+	// If the bucket is configured as a website, redirects requests for this object to
+	// another object in the same bucket or to an external URL. Amazon S3 stores the
+	// value of this header in the object metadata. For information about object
+	// metadata, see [Object Key and Metadata]in the Amazon S3 User Guide.
+	//
+	// In the following example, the request header sets the redirect to an object
+	// (anotherPage.html) in the same bucket:
+	//
+	//     x-amz-website-redirect-location: /anotherPage.html
+	//
+	// In the following example, the request header sets the object redirect to
+	// another website:
+	//
+	//     x-amz-website-redirect-location: http://www.example.com/
+	//
+	// For more information about website hosting in Amazon S3, see [Hosting Websites on Amazon S3] and [How to Configure Website Page Redirects] in the
+	// Amazon S3 User Guide.
+	//
+	// This functionality is not supported for directory buckets.
+	//
+	// [How to Configure Website Page Redirects]: https://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html
+	// [Hosting Websites on Amazon S3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html
+	// [Object Key and Metadata]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
+	WebsiteRedirectLocation string
+}
+
+// map non-zero string to *string
+func nzstring(v string) *string {
+	if v == "" {
+		return nil
+	}
+	return aws.String(v)
+}
+
+// map non-zero Time to *Time
+func nztime(t time.Time) *time.Time {
+	if t.IsZero() {
+		return nil
+	}
+	return aws.Time(t)
+}
+
+func (i PutObjectInput) mapSingleUploadInput(body io.Reader, checksumAlgorithm types.ChecksumAlgorithm) *s3.PutObjectInput {
+	input := &s3.PutObjectInput{
+		Bucket: aws.String(i.Bucket),
+		Key:    aws.String(i.Key),
+		Body:   body,
+	}
+	if i.ACL != "" {
+		input.ACL = s3types.ObjectCannedACL(i.ACL)
+	}
+	if i.ChecksumAlgorithm != "" {
+		input.ChecksumAlgorithm = s3types.ChecksumAlgorithm(i.ChecksumAlgorithm)
+	} else {
+		input.ChecksumAlgorithm = s3types.ChecksumAlgorithm(checksumAlgorithm)
+	}
+	if i.ObjectLockLegalHoldStatus != "" {
+		input.ObjectLockLegalHoldStatus = s3types.ObjectLockLegalHoldStatus(i.ObjectLockLegalHoldStatus)
+	}
+	if i.ObjectLockMode != "" {
+		input.ObjectLockMode = s3types.ObjectLockMode(i.ObjectLockMode)
+	}
+	if i.RequestPayer != "" {
+		input.RequestPayer = s3types.RequestPayer(i.RequestPayer)
+	}
+	if i.ServerSideEncryption != "" {
+		input.ServerSideEncryption = s3types.ServerSideEncryption(i.ServerSideEncryption)
+	}
+	if i.StorageClass != "" {
+		input.StorageClass = s3types.StorageClass(i.StorageClass)
+	}
+	input.BucketKeyEnabled = aws.Bool(i.BucketKeyEnabled)
+	input.CacheControl = nzstring(i.CacheControl)
+	input.ContentDisposition = nzstring(i.ContentDisposition)
+	input.ContentEncoding = nzstring(i.ContentEncoding)
+	input.ContentLanguage = nzstring(i.ContentLanguage)
+	input.ContentType = nzstring(i.ContentType)
+	input.ExpectedBucketOwner = nzstring(i.ExpectedBucketOwner)
+	input.GrantFullControl = nzstring(i.GrantFullControl)
+	input.GrantRead = nzstring(i.GrantRead)
+	input.GrantReadACP = nzstring(i.GrantReadACP)
+	input.GrantWriteACP = nzstring(i.GrantWriteACP)
+	input.Metadata = i.Metadata
+	input.SSECustomerAlgorithm = nzstring(i.SSECustomerAlgorithm)
+	input.SSECustomerKey = nzstring(i.SSECustomerKey)
+	input.SSEKMSEncryptionContext = nzstring(i.SSEKMSEncryptionContext)
+	input.SSEKMSKeyId = nzstring(i.SSEKMSKeyID)
+	input.Tagging = nzstring(i.Tagging)
+	input.WebsiteRedirectLocation = nzstring(i.WebsiteRedirectLocation)
+	input.Expires = nztime(i.Expires)
+	input.ObjectLockRetainUntilDate = nztime(i.ObjectLockRetainUntilDate)
+	return input
+}
+
+func (i PutObjectInput) mapCreateMultipartUploadInput() *s3.CreateMultipartUploadInput {
+	input := &s3.CreateMultipartUploadInput{
+		Bucket: aws.String(i.Bucket),
+		Key:    aws.String(i.Key),
+	}
+	if i.ACL != "" {
+		input.ACL = s3types.ObjectCannedACL(i.ACL)
+	}
+	if i.ChecksumAlgorithm != "" {
+		input.ChecksumAlgorithm = s3types.ChecksumAlgorithm(i.ChecksumAlgorithm)
+	} else {
+		input.ChecksumAlgorithm = s3types.ChecksumAlgorithm(i.ChecksumAlgorithm)
+	}
+	if i.ObjectLockLegalHoldStatus != "" {
+		input.ObjectLockLegalHoldStatus = s3types.ObjectLockLegalHoldStatus(i.ObjectLockLegalHoldStatus)
+	}
+	if i.ObjectLockMode != "" {
+		input.ObjectLockMode = s3types.ObjectLockMode(i.ObjectLockMode)
+	}
+	if i.RequestPayer != "" {
+		input.RequestPayer = s3types.RequestPayer(i.RequestPayer)
+	}
+	if i.ServerSideEncryption != "" {
+		input.ServerSideEncryption = s3types.ServerSideEncryption(i.ServerSideEncryption)
+	}
+	if i.StorageClass != "" {
+		input.StorageClass = s3types.StorageClass(i.StorageClass)
+	}
+	input.BucketKeyEnabled = aws.Bool(i.BucketKeyEnabled)
+	input.CacheControl = nzstring(i.CacheControl)
+	input.ContentDisposition = nzstring(i.ContentDisposition)
+	input.ContentEncoding = nzstring(i.ContentEncoding)
+	input.ContentLanguage = nzstring(i.ContentLanguage)
+	input.ContentType = nzstring(i.ContentType)
+	input.ExpectedBucketOwner = nzstring(i.ExpectedBucketOwner)
+	input.GrantFullControl = nzstring(i.GrantFullControl)
+	input.GrantRead = nzstring(i.GrantRead)
+	input.GrantReadACP = nzstring(i.GrantReadACP)
+	input.GrantWriteACP = nzstring(i.GrantWriteACP)
+	input.Metadata = i.Metadata
+	input.SSECustomerAlgorithm = nzstring(i.SSECustomerAlgorithm)
+	input.SSECustomerKey = nzstring(i.SSECustomerKey)
+	input.SSEKMSEncryptionContext = nzstring(i.SSEKMSEncryptionContext)
+	input.SSEKMSKeyId = nzstring(i.SSEKMSKeyID)
+	input.Tagging = nzstring(i.Tagging)
+	input.WebsiteRedirectLocation = nzstring(i.WebsiteRedirectLocation)
+	input.Expires = nztime(i.Expires)
+	input.ObjectLockRetainUntilDate = nztime(i.ObjectLockRetainUntilDate)
+	return input
+}
+
+func (i PutObjectInput) mapCompleteMultipartUploadInput(uploadID *string, completedParts completedParts) *s3.CompleteMultipartUploadInput {
+	input := &s3.CompleteMultipartUploadInput{
+		Bucket:   aws.String(i.Bucket),
+		Key:      aws.String(i.Key),
+		UploadId: uploadID,
+	}
+	if i.RequestPayer != "" {
+		input.RequestPayer = s3types.RequestPayer(i.RequestPayer)
+	}
+	input.ExpectedBucketOwner = nzstring(i.ExpectedBucketOwner)
+	input.SSECustomerAlgorithm = nzstring(i.SSECustomerAlgorithm)
+	input.SSECustomerKey = nzstring(i.SSECustomerKey)
+	var parts []s3types.CompletedPart
+	for _, part := range completedParts {
+		parts = append(parts, part.MapCompletedPart())
+	}
+	if parts != nil {
+		input.MultipartUpload = &s3types.CompletedMultipartUpload{Parts: parts}
+	}
+	return input
+}
+
+func (i PutObjectInput) mapUploadPartInput(body io.Reader, partNum *int32, uploadID *string) *s3.UploadPartInput {
+	input := &s3.UploadPartInput{
+		Bucket:     aws.String(i.Bucket),
+		Key:        aws.String(i.Key),
+		Body:       body,
+		PartNumber: partNum,
+		UploadId:   uploadID,
+	}
+	if i.ChecksumAlgorithm != "" {
+		input.ChecksumAlgorithm = s3types.ChecksumAlgorithm(i.ChecksumAlgorithm)
+	}
+	if i.RequestPayer != "" {
+		input.RequestPayer = s3types.RequestPayer(i.RequestPayer)
+	}
+	input.ExpectedBucketOwner = nzstring(i.ExpectedBucketOwner)
+	input.SSECustomerAlgorithm = nzstring(i.SSECustomerAlgorithm)
+	input.SSECustomerKey = nzstring(i.SSECustomerKey)
+	return input
+}
+
+func (i *PutObjectInput) mapAbortMultipartUploadInput(uploadID *string) *s3.AbortMultipartUploadInput {
+	input := &s3.AbortMultipartUploadInput{
+		Bucket:   aws.String(i.Bucket),
+		Key:      aws.String(i.Key),
+		UploadId: uploadID,
+	}
+	return input
+}
+
+// PutObjectOutput represents a response from the Upload() call. It contains common fields
+// of s3 PutObject and CompleteMultipartUpload output
+type PutObjectOutput struct {
+	// The ID for a multipart upload to S3. In the case of an error the error
+	// can be cast to the MultiUploadFailure interface to extract the upload ID.
+	// Will be empty string if multipart upload was not used, and the object
+	// was uploaded as a single PutObject call.
+	UploadID string
+
+	// The list of parts that were uploaded and their checksums. Will be empty
+	// if multipart upload was not used, and the object was uploaded as a
+	// single PutObject call.
+	CompletedParts []types.CompletedPart
+
+	// Indicates whether the uploaded object uses an S3 Bucket Key for server-side
+	// encryption with Amazon Web Services KMS (SSE-KMS).
+	BucketKeyEnabled bool
+
+	// The base64-encoded, 32-bit CRC32 checksum of the object.
+	ChecksumCRC32 string
+
+	// The base64-encoded, 32-bit CRC32C checksum of the object.
+	ChecksumCRC32C string
+
+	// The base64-encoded, 160-bit SHA-1 digest of the object.
+	ChecksumSHA1 string
+
+	// The base64-encoded, 256-bit SHA-256 digest of the object.
+	ChecksumSHA256 string
+
+	// Entity tag for the uploaded object.
+	ETag string
+
+	// If the object expiration is configured, this will contain the expiration date
+	// (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.
+	Expiration string
+
+	// The bucket where the newly created object is put
+	Bucket string
+
+	// The object key of the newly created object.
+	Key string
+
+	// If present, indicates that the requester was successfully charged for the
+	// request.
+	RequestCharged types.RequestCharged
+
+	// If present, specifies the ID of the Amazon Web Services Key Management Service
+	// (Amazon Web Services KMS) symmetric customer managed customer master key (CMK)
+	// that was used for the object.
+	SSEKMSKeyID string
+
+	// If you specified server-side encryption either with an Amazon S3-managed
+	// encryption key or an Amazon Web Services KMS customer master key (CMK) in your
+	// initiate multipart upload request, the response includes this header. It
+	// confirms the encryption algorithm that Amazon S3 used to encrypt the object.
+	ServerSideEncryption types.ServerSideEncryption
+
+	// The version of the object that was uploaded. Will only be populated if
+	// the S3 Bucket is versioned. If the bucket is not versioned this field
+	// will not be set.
+	VersionID string
+
+	// Metadata pertaining to the operation's result.
+	ResultMetadata smithymiddleware.Metadata
+}
+
+func (o *PutObjectOutput) mapFromPutObjectOutput(out *s3.PutObjectOutput, bucket, key string) {
+	o.BucketKeyEnabled = aws.ToBool(out.BucketKeyEnabled)
+	o.ChecksumCRC32 = aws.ToString(out.ChecksumCRC32)
+	o.ChecksumCRC32C = aws.ToString(out.ChecksumCRC32C)
+	o.ChecksumSHA1 = aws.ToString(out.ChecksumSHA1)
+	o.ChecksumSHA256 = aws.ToString(out.ChecksumSHA256)
+	o.ETag = aws.ToString(out.ETag)
+	o.Expiration = aws.ToString(out.Expiration)
+	o.Bucket = bucket
+	o.Key = key
+	o.RequestCharged = types.RequestCharged(out.RequestCharged)
+	o.SSEKMSKeyID = aws.ToString(out.SSEKMSKeyId)
+	o.ServerSideEncryption = types.ServerSideEncryption(out.ServerSideEncryption)
+	o.VersionID = aws.ToString(out.VersionId)
+	o.ResultMetadata = out.ResultMetadata.Clone()
+}
+
+func (o *PutObjectOutput) mapFromCompleteMultipartUploadOutput(out *s3.CompleteMultipartUploadOutput, bucket, uploadID string, completedParts completedParts) {
+	o.UploadID = uploadID
+	o.CompletedParts = completedParts
+	o.BucketKeyEnabled = aws.ToBool(out.BucketKeyEnabled)
+	o.ChecksumCRC32 = aws.ToString(out.ChecksumCRC32)
+	o.ChecksumCRC32C = aws.ToString(out.ChecksumCRC32C)
+	o.ChecksumSHA1 = aws.ToString(out.ChecksumSHA1)
+	o.ChecksumSHA256 = aws.ToString(out.ChecksumSHA256)
+	o.ETag = aws.ToString(out.ETag)
+	o.Expiration = aws.ToString(out.Expiration)
+	o.Bucket = bucket
+	o.Key = aws.ToString(out.Key)
+	o.RequestCharged = types.RequestCharged(out.RequestCharged)
+	o.SSEKMSKeyID = aws.ToString(out.SSEKMSKeyId)
+	o.ServerSideEncryption = types.ServerSideEncryption(out.ServerSideEncryption)
+	o.VersionID = aws.ToString(out.VersionId)
+	o.ResultMetadata = out.ResultMetadata
+}
+
+// PutObject uploads an object to S3, intelligently buffering large
+// files into smaller chunks and sending them in parallel across multiple
+// goroutines. You can configure the chunk size and concurrency through the
+// Options parameters.
+//
+// Additional functional options can be provided to configure the individual
+// upload. These options are copies of the original Options instance, the client of which PutObject is called from.
+// Modifying the options will not impact the original Client and Options instance.
+func (c *Client) PutObject(ctx context.Context, input *PutObjectInput, opts ...func(*Options)) (*PutObjectOutput, error) {
+	i := uploader{in: input, options: c.options.Copy()}
+	for _, opt := range opts {
+		opt(&i.options)
+	}
+
+	return i.upload(ctx)
+}
+
+type uploader struct {
+	options Options
+
+	in *PutObjectInput
+
+	// PartPool allows for the re-usage of streaming payload part buffers between upload calls
+	partPool bytesBufferPool
+}
+
+func (u *uploader) upload(ctx context.Context) (*PutObjectOutput, error) {
+	if err := u.init(); err != nil {
+		return nil, fmt.Errorf("unable to initialize upload: %w", err)
+	}
+	defer u.partPool.Close()
+
+	clientOptions := []func(o *s3.Options){
+		func(o *s3.Options) {
+			o.APIOptions = append(o.APIOptions,
+				middleware.AddSDKAgentKey(middleware.FeatureMetadata, userAgentKey),
+				addFeatureUserAgent,
+			)
+		}}
+
+	r, _, cleanUp, err := u.nextReader(ctx)
+
+	if err == io.EOF {
+		return u.singleUpload(ctx, r, cleanUp, clientOptions...)
+	} else if err != nil {
+		cleanUp()
+		return nil, err
+	}
+
+	mu := multiUploader{
+		uploader: u,
+	}
+	return mu.upload(ctx, r, cleanUp, clientOptions...)
+}
+
+func (u *uploader) init() error {
+	if err := u.initSize(); err != nil {
+		return err
+	}
+	u.partPool = newDefaultSlicePool(u.options.PartSizeBytes, u.options.Concurrency+1)
+
+	return nil
+}
+
+// initSize checks user configured partsize and up-size it if calculated part count exceeds max value
+func (u *uploader) initSize() error {
+	if u.options.PartSizeBytes < minPartSizeBytes {
+		return fmt.Errorf("part size must be at least %d bytes", minPartSizeBytes)
+	}
+
+	var bodySize int64
+	switch r := u.in.Body.(type) {
+	case io.Seeker:
+		n, err := types.SeekerLen(r)
+		if err != nil {
+			return err
+		}
+		bodySize = n
+	default:
+		if l := u.in.ContentLength; l > 0 {
+			bodySize = l
+		}
+	}
+
+	// Try to adjust partSize if it is too small and account for
+	// integer division truncation.
+	if bodySize/u.options.PartSizeBytes >= int64(defaultMaxUploadParts) {
+		// Add one to the part size to account for remainders
+		// during the size calculation. e.g odd number of bytes.
+		u.options.PartSizeBytes = (bodySize / int64(defaultMaxUploadParts)) + 1
+	}
+	return nil
+}
+
+func (u *uploader) singleUpload(ctx context.Context, r io.Reader, cleanUp func(), clientOptions ...func(*s3.Options)) (*PutObjectOutput, error) {
+	defer cleanUp()
+
+	params := u.in.mapSingleUploadInput(r, u.options.ChecksumAlgorithm)
+
+	out, err := u.options.S3.PutObject(ctx, params, clientOptions...)
+	if err != nil {
+		return nil, err
+	}
+
+	var output PutObjectOutput
+	output.mapFromPutObjectOutput(out, u.in.Bucket, u.in.Key)
+	return &output, nil
+}
+
+// nextReader reads the next chunk of data from input Body
+func (u *uploader) nextReader(ctx context.Context) (io.Reader, int, func(), error) {
+	part, err := u.partPool.Get(ctx)
+	if err != nil {
+		return nil, 0, func() {}, err
+	}
+
+	n, err := readFillBuf(u.in.Body, part)
+
+	cleanup := func() {
+		u.partPool.Put(part)
+	}
+	return bytes.NewReader(part[0:n]), n, cleanup, err
+}
+
+func readFillBuf(r io.Reader, b []byte) (offset int, err error) {
+	for offset < len(b) && err == nil {
+		var n int
+		n, err = r.Read(b[offset:])
+		offset += n
+	}
+	return offset, err
+}
+
+type multiUploader struct {
+	*uploader
+	wg       sync.WaitGroup
+	m        sync.Mutex
+	err      error
+	uploadID *string
+	parts    completedParts
+}
+
+type ulChunk struct {
+	buf     io.Reader
+	partNum *int32
+	cleanup func()
+}
+
+type completedParts []types.CompletedPart
+
+func (cp completedParts) Len() int {
+	return len(cp)
+}
+
+func (cp completedParts) Less(i, j int) bool {
+	return aws.ToInt32(cp[i].PartNumber) < aws.ToInt32(cp[j].PartNumber)
+}
+
+func (cp completedParts) Swap(i, j int) {
+	cp[i], cp[j] = cp[j], cp[i]
+}
+
+// upload will perform a multipart upload using the firstBuf buffer containing
+// the first chunk of data.
+func (u *multiUploader) upload(ctx context.Context, firstBuf io.Reader, cleanup func(), clientOptions ...func(*s3.Options)) (*PutObjectOutput, error) {
+	params := u.uploader.in.mapCreateMultipartUploadInput()
+
+	// Create a multipart
+	resp, err := u.uploader.options.S3.CreateMultipartUpload(ctx, params, clientOptions...)
+	if err != nil {
+		cleanup()
+		return nil, err
+	}
+	u.uploadID = resp.UploadId
+
+	ch := make(chan ulChunk, u.options.Concurrency)
+	for i := 0; i < u.options.Concurrency; i++ {
+		// launch workers
+		u.wg.Add(1)
+		go u.readChunk(ctx, ch, clientOptions...)
+	}
+
+	var partNum int32 = 1
+	ch <- ulChunk{buf: firstBuf, partNum: aws.Int32(partNum), cleanup: cleanup}
+	for u.geterr() == nil && err == nil {
+		partNum++
+		var (
+			data         io.Reader
+			nextChunkLen int
+			ok           bool
+		)
+		data, nextChunkLen, cleanup, err = u.nextReader(ctx)
+		ok, err = u.shouldContinue(partNum, nextChunkLen, err)
+		if !ok {
+			cleanup()
+			if err != nil {
+				u.seterr(err)
+			}
+			break
+		}
+
+		ch <- ulChunk{buf: data, partNum: aws.Int32(partNum), cleanup: cleanup}
+	}
+
+	// close the channel, wait for workers and complete upload
+	close(ch)
+	u.wg.Wait()
+	completeOut := u.complete(ctx, clientOptions...)
+
+	if err := u.geterr(); err != nil {
+		return nil, &multipartUploadError{
+			err:      err,
+			uploadID: *u.uploadID,
+		}
+	}
+
+	var out PutObjectOutput
+	out.mapFromCompleteMultipartUploadOutput(completeOut, aws.ToString(params.Bucket), aws.ToString(u.uploadID), u.parts)
+	return &out, nil
+}
+
+func (u *multiUploader) shouldContinue(part int32, nextChunkLen int, err error) (bool, error) {
+	if err != nil && err != io.EOF {
+		return false, fmt.Errorf("read multipart upload data failed, %w", err)
+	}
+
+	if nextChunkLen == 0 {
+		// No need to upload empty part, if file was empty to start
+		// with empty single part would of been created and never
+		// started multipart upload.
+		return false, nil
+	}
+
+	// This upload exceeded maximum number of supported parts, error now.
+	if part > defaultMaxUploadParts {
+		return false, fmt.Errorf(fmt.Sprintf("exceeded total allowed S3 limit MaxUploadParts (%d). Adjust PartSize to fit in this limit", defaultMaxUploadParts))
+	}
+
+	return true, err
+}
+
+// readChunk runs in worker goroutines to pull chunks off of the ch channel
+// and send() them as UploadPart requests.
+func (u *multiUploader) readChunk(ctx context.Context, ch chan ulChunk, clientOptions ...func(*s3.Options)) {
+	defer u.wg.Done()
+	for {
+		data, ok := <-ch
+
+		if !ok {
+			break
+		}
+
+		if u.geterr() == nil {
+			if err := u.send(ctx, data, clientOptions...); err != nil {
+				u.seterr(err)
+			}
+		}
+
+		data.cleanup()
+	}
+}
+
+// send performs an UploadPart request and keeps track of the completed
+// part information.
+func (u *multiUploader) send(ctx context.Context, c ulChunk, clientOptions ...func(*s3.Options)) error {
+	params := u.in.mapUploadPartInput(c.buf, c.partNum, u.uploadID)
+	resp, err := u.options.S3.UploadPart(ctx, params, clientOptions...)
+	if err != nil {
+		return err
+	}
+
+	var completed types.CompletedPart
+	completed.MapFrom(resp, c.partNum)
+
+	u.m.Lock()
+	u.parts = append(u.parts, completed)
+	u.m.Unlock()
+
+	return nil
+}
+
+// geterr is a thread-safe getter for the error object
+func (u *multiUploader) geterr() error {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	return u.err
+}
+
+// seterr is a thread-safe setter for the error object
+func (u *multiUploader) seterr(e error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	u.err = e
+}
+
+func (u *multiUploader) fail(ctx context.Context, clientOptions ...func(*s3.Options)) {
+	params := u.in.mapAbortMultipartUploadInput(u.uploadID)
+	_, err := u.options.S3.AbortMultipartUpload(ctx, params, clientOptions...)
+	if err != nil {
+		u.seterr(fmt.Errorf("failed to abort multipart upload (%v), triggered after multipart upload failed: %v", err, u.geterr()))
+	}
+}
+
+// complete successfully completes a multipart upload and returns the response.
+func (u *multiUploader) complete(ctx context.Context, clientOptions ...func(*s3.Options)) *s3.CompleteMultipartUploadOutput {
+	if u.geterr() != nil {
+		u.fail(ctx)
+		return nil
+	}
+
+	// Parts must be sorted in PartNumber order.
+	sort.Sort(u.parts)
+
+	params := u.in.mapCompleteMultipartUploadInput(u.uploadID, u.parts)
+
+	resp, err := u.options.S3.CompleteMultipartUpload(ctx, params, clientOptions...)
+	if err != nil {
+		u.seterr(err)
+		u.fail(ctx)
+	}
+
+	return resp
+}
+
+func addFeatureUserAgent(stack *smithymiddleware.Stack) error {
+	ua, err := getOrAddRequestUserAgent(stack)
+	if err != nil {
+		return err
+	}
+
+	ua.AddUserAgentFeature(middleware.UserAgentFeatureS3Transfer)
+	return nil
+}
+
+func getOrAddRequestUserAgent(stack *smithymiddleware.Stack) (*middleware.RequestUserAgent, error) {
+	id := (*middleware.RequestUserAgent)(nil).ID()
+	mw, ok := stack.Build.Get(id)
+	if !ok {
+		mw = middleware.NewRequestUserAgent()
+		if err := stack.Build.Add(mw, smithymiddleware.After); err != nil {
+			return nil, err
+		}
+	}
+
+	ua, ok := mw.(*middleware.RequestUserAgent)
+	if !ok {
+		return nil, fmt.Errorf("%T for %s middleware did not match expected type", mw, id)
+	}
+
+	return ua, nil
+}
diff --git a/feature/s3/transfermanager/api_op_PutObject_integ_test.go b/feature/s3/transfermanager/api_op_PutObject_integ_test.go
new file mode 100644
index 00000000000..853f0441b4a
--- /dev/null
+++ b/feature/s3/transfermanager/api_op_PutObject_integ_test.go
@@ -0,0 +1,26 @@
+//go:build integration
+// +build integration
+
+package transfermanager
+
+import (
+	"bytes"
+	"strings"
+	"testing"
+)
+
+func TestInteg_PutObject(t *testing.T) {
+	t.Skip("broken until multipart upload addressed")
+
+	cases := map[string]putObjectTestData{
+		"seekable body":         {Body: strings.NewReader("hello world"), ExpectBody: []byte("hello world")},
+		"empty string body":     {Body: strings.NewReader(""), ExpectBody: []byte("")},
+		"multipart upload body": {Body: bytes.NewReader(largeObjectBuf), ExpectBody: largeObjectBuf},
+	}
+
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			testPutObject(t, setupMetadata.Buckets.Source.Name, c)
+		})
+	}
+}
diff --git a/feature/s3/transfermanager/dns_cache.go b/feature/s3/transfermanager/dns_cache.go
new file mode 100644
index 00000000000..f9f041cbb57
--- /dev/null
+++ b/feature/s3/transfermanager/dns_cache.go
@@ -0,0 +1,61 @@
+package transfermanager
+
+import (
+	"sync"
+	"time"
+
+	"github.com/aws/smithy-go/container/private/cache"
+	"github.com/aws/smithy-go/container/private/cache/lru"
+)
+
+// dnsCache implements an LRU cache of DNS query results by host.
+//
+// Cache retrievals will automatically rotate between IP addresses for
+// multi-value query results.
+type dnsCache struct {
+	mu    sync.Mutex
+	addrs cache.Cache
+}
+
+// newDNSCache returns an initialized dnsCache with given capacity.
+func newDNSCache(cap int) *dnsCache {
+	return &dnsCache{
+		addrs: lru.New(cap),
+	}
+}
+
+// GetAddr returns the next IP address for the given host if present in the
+// cache.
+func (c *dnsCache) GetAddr(host string) (string, bool) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	v, ok := c.addrs.Get(host)
+	if !ok {
+		return "", false
+	}
+
+	record := v.(*dnsCacheEntry)
+	if timeNow().After(record.expires) {
+		return "", false
+	}
+
+	addr := record.addrs[record.index]
+	record.index = (record.index + 1) % len(record.addrs)
+	return addr, true
+}
+
+// PutAddrs stores a DNS query result in the cache, overwriting any present
+// entry for the host if it exists.
+func (c *dnsCache) PutAddrs(host string, addrs []string, expires time.Time) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	c.addrs.Put(host, &dnsCacheEntry{addrs, expires, 0})
+}
+
+type dnsCacheEntry struct {
+	addrs   []string
+	expires time.Time
+	index   int
+}
diff --git a/feature/s3/transfermanager/doc.go b/feature/s3/transfermanager/doc.go
new file mode 100644
index 00000000000..6744102abb2
--- /dev/null
+++ b/feature/s3/transfermanager/doc.go
@@ -0,0 +1,31 @@
+// Package transfermanager implements the Amazon S3 Transfer Manager, a
+// high-level S3 client library.
+//
+// Package transfermanager is the new iteration of the original
+// [feature/s3/manager] module implemented for the AWS SDK Go v2.
+//
+// # Beta
+//
+// This module is currently in a BETA release state. It is not subject to the
+// same backwards-compatibility guarantees provided by the generally-available
+// (GA) AWS SDK for Go v2. Features may be added or removed without warning,
+// and APIs may break.
+//
+// For the current GA transfer manager for AWS SDK Go v2, see
+// [feature/s3/manager].
+//
+// # Features
+//
+// Package transfermanager implements a high-level S3 client with support for the
+// following:
+//   - [Client.PutObject] - enhanced object write support w/ automatic
+//     multipart upload for large objects
+//
+// The package also exposes several opt-in hooks that configure an
+// http.Transport that may convey performance/reliability enhancements in
+// certain user environments:
+//   - round-robin DNS ([WithRoundRobinDNS])
+//   - multi-NIC dialer ([WithRotoDialer])
+//
+// [feature/s3/manager]: https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/feature/s3/manager
+package transfermanager
diff --git a/feature/s3/transfermanager/go.mod b/feature/s3/transfermanager/go.mod
new file mode 100644
index 00000000000..39e5c4be560
--- /dev/null
+++ b/feature/s3/transfermanager/go.mod
@@ -0,0 +1,61 @@
+module github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager
+
+go 1.21
+
+require (
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12
+	github.com/aws/smithy-go v1.22.2
+)
+
+require (
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+)
+
+replace github.com/aws/aws-sdk-go-v2 => ../../../
+
+replace github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream => ../../../aws/protocol/eventstream/
+
+replace github.com/aws/aws-sdk-go-v2/config => ../../../config/
+
+replace github.com/aws/aws-sdk-go-v2/credentials => ../../../credentials/
+
+replace github.com/aws/aws-sdk-go-v2/feature/ec2/imds => ../../../feature/ec2/imds/
+
+replace github.com/aws/aws-sdk-go-v2/internal/configsources => ../../../internal/configsources/
+
+replace github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => ../../../internal/endpoints/v2/
+
+replace github.com/aws/aws-sdk-go-v2/internal/ini => ../../../internal/ini/
+
+replace github.com/aws/aws-sdk-go-v2/internal/v4a => ../../../internal/v4a/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding => ../../../service/internal/accept-encoding/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/checksum => ../../../service/internal/checksum/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/presigned-url => ../../../service/internal/presigned-url/
+
+replace github.com/aws/aws-sdk-go-v2/service/internal/s3shared => ../../../service/internal/s3shared/
+
+replace github.com/aws/aws-sdk-go-v2/service/s3 => ../../../service/s3/
+
+replace github.com/aws/aws-sdk-go-v2/service/sso => ../../../service/sso/
+
+replace github.com/aws/aws-sdk-go-v2/service/ssooidc => ../../../service/ssooidc/
+
+replace github.com/aws/aws-sdk-go-v2/service/sts => ../../../service/sts/
diff --git a/feature/s3/transfermanager/go.sum b/feature/s3/transfermanager/go.sum
new file mode 100644
index 00000000000..cad7e6ad46a
--- /dev/null
+++ b/feature/s3/transfermanager/go.sum
@@ -0,0 +1,2 @@
+github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
+github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
diff --git a/feature/s3/transfermanager/go_module_metadata.go b/feature/s3/transfermanager/go_module_metadata.go
new file mode 100644
index 00000000000..33f1ddfbdee
--- /dev/null
+++ b/feature/s3/transfermanager/go_module_metadata.go
@@ -0,0 +1,6 @@
+// Code generated by internal/repotools/cmd/updatemodulemeta DO NOT EDIT.
+
+package transfermanager
+
+// goModuleVersion is the tagged release for this module
+const goModuleVersion = "tip"
diff --git a/feature/s3/transfermanager/internal/testing/endpoint.go b/feature/s3/transfermanager/internal/testing/endpoint.go
new file mode 100644
index 00000000000..082aedec4f2
--- /dev/null
+++ b/feature/s3/transfermanager/internal/testing/endpoint.go
@@ -0,0 +1,25 @@
+package testing
+
+import (
+	"context"
+	"net/url"
+
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	smithyendpoints "github.com/aws/smithy-go/endpoints"
+)
+
+// EndpointResolverV2 is a mock s3 endpoint resolver v2 for testing
+type EndpointResolverV2 struct {
+	URL string
+}
+
+// ResolveEndpoint returns the given endpoint url
+func (r EndpointResolverV2) ResolveEndpoint(ctx context.Context, params s3.EndpointParameters) (smithyendpoints.Endpoint, error) {
+	u, err := url.Parse(r.URL)
+	if err != nil {
+		return smithyendpoints.Endpoint{}, err
+	}
+	return smithyendpoints.Endpoint{
+		URI: *u,
+	}, nil
+}
diff --git a/feature/s3/transfermanager/internal/testing/upload.go b/feature/s3/transfermanager/internal/testing/upload.go
new file mode 100644
index 00000000000..1764fc089e2
--- /dev/null
+++ b/feature/s3/transfermanager/internal/testing/upload.go
@@ -0,0 +1,193 @@
+package testing
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"slices"
+	"sync"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+)
+
+// UploadLoggingClient is a mock client that can be used to record and stub responses for testing the Uploader.
+type UploadLoggingClient struct {
+	Invocations []string
+	Params      []interface{}
+
+	ConsumeBody bool
+
+	ignoredOperations []string
+
+	PartNum int
+	m       sync.Mutex
+
+	PutObjectFn               func(*UploadLoggingClient, *s3.PutObjectInput) (*s3.PutObjectOutput, error)
+	UploadPartFn              func(*UploadLoggingClient, *s3.UploadPartInput) (*s3.UploadPartOutput, error)
+	CreateMultipartUploadFn   func(*UploadLoggingClient, *s3.CreateMultipartUploadInput) (*s3.CreateMultipartUploadOutput, error)
+	CompleteMultipartUploadFn func(*UploadLoggingClient, *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error)
+	AbortMultipartUploadFn    func(*UploadLoggingClient, *s3.AbortMultipartUploadInput) (*s3.AbortMultipartUploadOutput, error)
+}
+
+func (u *UploadLoggingClient) simulateHTTPClientOption(optFns ...func(*s3.Options)) error {
+
+	o := s3.Options{
+		HTTPClient: httpDoFunc(func(r *http.Request) (*http.Response, error) {
+			return &http.Response{
+				Request: r,
+			}, nil
+		}),
+	}
+
+	for _, fn := range optFns {
+		fn(&o)
+	}
+
+	_, err := o.HTTPClient.Do(&http.Request{
+		URL: &url.URL{
+			Scheme:   "https",
+			Host:     "mock.amazonaws.com",
+			Path:     "/key",
+			RawQuery: "foo=bar",
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type httpDoFunc func(*http.Request) (*http.Response, error)
+
+func (f httpDoFunc) Do(r *http.Request) (*http.Response, error) {
+	return f(r)
+}
+
+func (u *UploadLoggingClient) traceOperation(name string, params interface{}) {
+	if slices.Contains(u.ignoredOperations, name) {
+		return
+	}
+	u.Invocations = append(u.Invocations, name)
+	u.Params = append(u.Params, params)
+
+}
+
+// PutObject is the S3 PutObject API.
+func (u *UploadLoggingClient) PutObject(ctx context.Context, params *s3.PutObjectInput, optFns ...func(*s3.Options)) (*s3.PutObjectOutput, error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	if u.ConsumeBody {
+		io.Copy(ioutil.Discard, params.Body)
+	}
+
+	u.traceOperation("PutObject", params)
+
+	if err := u.simulateHTTPClientOption(optFns...); err != nil {
+		return nil, err
+	}
+
+	if u.PutObjectFn != nil {
+		return u.PutObjectFn(u, params)
+	}
+
+	return &s3.PutObjectOutput{
+		VersionId: aws.String("VERSION-ID"),
+	}, nil
+}
+
+// UploadPart is the S3 UploadPart API.
+func (u *UploadLoggingClient) UploadPart(ctx context.Context, params *s3.UploadPartInput, optFns ...func(*s3.Options)) (*s3.UploadPartOutput, error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	if u.ConsumeBody {
+		io.Copy(ioutil.Discard, params.Body)
+	}
+
+	u.traceOperation("UploadPart", params)
+
+	if err := u.simulateHTTPClientOption(optFns...); err != nil {
+		return nil, err
+	}
+
+	if u.UploadPartFn != nil {
+		return u.UploadPartFn(u, params)
+	}
+
+	return &s3.UploadPartOutput{
+		ETag: aws.String(fmt.Sprintf("ETAG%d", *params.PartNumber)),
+	}, nil
+}
+
+// CreateMultipartUpload is the S3 CreateMultipartUpload API.
+func (u *UploadLoggingClient) CreateMultipartUpload(ctx context.Context, params *s3.CreateMultipartUploadInput, optFns ...func(*s3.Options)) (*s3.CreateMultipartUploadOutput, error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	u.traceOperation("CreateMultipartUpload", params)
+
+	if err := u.simulateHTTPClientOption(optFns...); err != nil {
+		return nil, err
+	}
+
+	if u.CreateMultipartUploadFn != nil {
+		return u.CreateMultipartUploadFn(u, params)
+	}
+
+	return &s3.CreateMultipartUploadOutput{
+		UploadId: aws.String("UPLOAD-ID"),
+	}, nil
+}
+
+// CompleteMultipartUpload is the S3 CompleteMultipartUpload API.
+func (u *UploadLoggingClient) CompleteMultipartUpload(ctx context.Context, params *s3.CompleteMultipartUploadInput, optFns ...func(*s3.Options)) (*s3.CompleteMultipartUploadOutput, error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	u.traceOperation("CompleteMultipartUpload", params)
+
+	if err := u.simulateHTTPClientOption(optFns...); err != nil {
+		return nil, err
+	}
+
+	if u.CompleteMultipartUploadFn != nil {
+		return u.CompleteMultipartUploadFn(u, params)
+	}
+
+	return &s3.CompleteMultipartUploadOutput{
+		Location:  aws.String("http://location"),
+		VersionId: aws.String("VERSION-ID"),
+	}, nil
+}
+
+// AbortMultipartUpload is the S3 AbortMultipartUpload API.
+func (u *UploadLoggingClient) AbortMultipartUpload(ctx context.Context, params *s3.AbortMultipartUploadInput, optFns ...func(*s3.Options)) (*s3.AbortMultipartUploadOutput, error) {
+	u.m.Lock()
+	defer u.m.Unlock()
+
+	u.traceOperation("AbortMultipartUpload", params)
+	if err := u.simulateHTTPClientOption(optFns...); err != nil {
+		return nil, err
+	}
+
+	if u.AbortMultipartUploadFn != nil {
+		return u.AbortMultipartUploadFn(u, params)
+	}
+
+	return &s3.AbortMultipartUploadOutput{}, nil
+}
+
+// NewUploadLoggingClient returns a new UploadLoggingClient.
+func NewUploadLoggingClient(ignoredOps []string) (*UploadLoggingClient, *[]string, *[]interface{}) {
+	c := &UploadLoggingClient{
+		ignoredOperations: ignoredOps,
+	}
+
+	return c, &c.Invocations, &c.Params
+}
diff --git a/feature/s3/transfermanager/options.go b/feature/s3/transfermanager/options.go
new file mode 100644
index 00000000000..a49e74afd64
--- /dev/null
+++ b/feature/s3/transfermanager/options.go
@@ -0,0 +1,63 @@
+package transfermanager
+
+import "github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager/types"
+
+// Options provides params needed for transfer api calls
+type Options struct {
+	// The client to use when uploading to S3.
+	S3 S3APIClient
+
+	// The buffer size (in bytes) to use when buffering data into chunks and
+	// sending them as parts to S3. The minimum allowed part size is 5MB, and
+	// if this value is set to zero, the DefaultUploadPartSize value will be used.
+	PartSizeBytes int64
+
+	// The threshold bytes to decide when the file should be multi-uploaded
+	MultipartUploadThreshold int64
+
+	// Option to disable checksum validation for download
+	DisableChecksum bool
+
+	// Checksum algorithm to use for upload
+	ChecksumAlgorithm types.ChecksumAlgorithm
+
+	// The number of goroutines to spin up in parallel per call to Upload when
+	// sending parts. If this is set to zero, the DefaultUploadConcurrency value
+	// will be used.
+	//
+	// The concurrency pool is not shared between calls to Upload.
+	Concurrency int
+}
+
+func (o *Options) init() {
+}
+
+func resolveConcurrency(o *Options) {
+	if o.Concurrency == 0 {
+		o.Concurrency = defaultTransferConcurrency
+	}
+}
+
+func resolvePartSizeBytes(o *Options) {
+	if o.PartSizeBytes == 0 {
+		o.PartSizeBytes = minPartSizeBytes
+	}
+}
+
+func resolveChecksumAlgorithm(o *Options) {
+	if o.ChecksumAlgorithm == "" {
+		o.ChecksumAlgorithm = types.ChecksumAlgorithmCrc32
+	}
+}
+
+func resolveMultipartUploadThreshold(o *Options) {
+	if o.MultipartUploadThreshold == 0 {
+		o.MultipartUploadThreshold = defaultMultipartUploadThreshold
+	}
+}
+
+// Copy returns new copy of the Options
+func (o Options) Copy() Options {
+	to := o
+	return to
+}
diff --git a/feature/s3/transfermanager/pool.go b/feature/s3/transfermanager/pool.go
new file mode 100644
index 00000000000..a4a786e2357
--- /dev/null
+++ b/feature/s3/transfermanager/pool.go
@@ -0,0 +1,62 @@
+package transfermanager
+
+import (
+	"context"
+	"fmt"
+)
+
+type bytesBufferPool interface {
+	Get(context.Context) ([]byte, error)
+	Put([]byte)
+	Close()
+}
+
+type defaultSlicePool struct {
+	slices chan []byte
+}
+
+func newDefaultSlicePool(sliceSize int64, capacity int) *defaultSlicePool {
+	p := &defaultSlicePool{}
+
+	slices := make(chan []byte, capacity)
+	for i := 0; i < capacity; i++ {
+		slices <- make([]byte, sliceSize)
+	}
+
+	p.slices = slices
+	return p
+}
+
+var errZeroCapacity = fmt.Errorf("get called on zero capacity pool")
+
+func (p *defaultSlicePool) Get(ctx context.Context) ([]byte, error) {
+	select {
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	default:
+	}
+
+	for {
+		select {
+		case bs, ok := <-p.slices:
+			if !ok {
+				return nil, errZeroCapacity
+			}
+			return bs, nil
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		}
+	}
+}
+
+func (p *defaultSlicePool) Put(bs []byte) {
+	p.slices <- bs
+}
+
+func (p *defaultSlicePool) Close() {
+	close(p.slices)
+	for range p.slices {
+		// drain channel
+	}
+	p.slices = nil
+}
diff --git a/feature/s3/transfermanager/pool_test.go b/feature/s3/transfermanager/pool_test.go
new file mode 100644
index 00000000000..74a6d9b49b0
--- /dev/null
+++ b/feature/s3/transfermanager/pool_test.go
@@ -0,0 +1,47 @@
+package transfermanager
+
+import (
+	"context"
+	"sync"
+	"testing"
+)
+
+func TestDefaultSlicePool(t *testing.T) {
+	pool := newDefaultSlicePool(1, 2)
+
+	var bs []byte
+	var err error
+	var wg sync.WaitGroup
+
+	for i := 0; i < 200; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			pool.Put(make([]byte, 1))
+		}()
+	}
+	// wait for a slice to be put back
+	for i := 0; i < 200; i++ {
+		bs, err = pool.Get(context.Background())
+		if err != nil {
+			t.Errorf("failed to get slice from pool: %v", err)
+		}
+	}
+
+	wg.Wait()
+
+	// failed to get a slice due to ctx cancelled
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	bs, err = pool.Get(ctx)
+	if err == nil {
+		pool.Put(bs)
+		t.Errorf("expectd no slice to be returned")
+	}
+
+	if e, a := 2, len(pool.slices); e != a {
+		t.Errorf("expect pool size to be %v, got %v", e, a)
+	}
+
+	pool.Close()
+}
diff --git a/feature/s3/transfermanager/putobject_test.go b/feature/s3/transfermanager/putobject_test.go
new file mode 100644
index 00000000000..06cd0ebe149
--- /dev/null
+++ b/feature/s3/transfermanager/putobject_test.go
@@ -0,0 +1,904 @@
+package transfermanager
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"reflect"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
+	s3testing "github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager/internal/testing"
+	"github.com/aws/aws-sdk-go-v2/internal/awstesting"
+	"github.com/aws/aws-sdk-go-v2/internal/sdk"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+)
+
+// getReaderLength discards the bytes from reader and returns the length
+func getReaderLength(r io.Reader) int64 {
+	n, _ := io.Copy(ioutil.Discard, r)
+	return n
+}
+
+func TestUploadOrderMulti(t *testing.T) {
+	c, invocations, args := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket:               "Bucket",
+		Key:                  "Key - value",
+		Body:                 bytes.NewReader(buf20MB),
+		ServerSideEncryption: "aws:kms",
+		SSEKMSKeyID:          "KmsId",
+		ContentType:          "content/type",
+	})
+
+	if err != nil {
+		t.Errorf("Expected no error but received %v", err)
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart", "UploadPart", "CompleteMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Errorf(diff)
+	}
+
+	if "UPLOAD-ID" != resp.UploadID {
+		t.Errorf("expect %q, got %q", "UPLOAD-ID", resp.UploadID)
+	}
+
+	if "VERSION-ID" != resp.VersionID {
+		t.Errorf("expect %q, got %q", "VERSION-ID", resp.VersionID)
+	}
+
+	// Validate input values
+
+	// UploadPart
+	for i := 1; i < 4; i++ {
+		v := aws.ToString((*args)[i].(*s3.UploadPartInput).UploadId)
+		if "UPLOAD-ID" != v {
+			t.Errorf("Expected %q, but received %q", "UPLOAD-ID", v)
+		}
+	}
+
+	// CompleteMultipartUpload
+	v := aws.ToString((*args)[4].(*s3.CompleteMultipartUploadInput).UploadId)
+	if "UPLOAD-ID" != v {
+		t.Errorf("Expected %q, but received %q", "UPLOAD-ID", v)
+	}
+
+	parts := (*args)[4].(*s3.CompleteMultipartUploadInput).MultipartUpload.Parts
+
+	for i := 0; i < 3; i++ {
+		num := parts[i].PartNumber
+		etag := aws.ToString(parts[i].ETag)
+
+		if int32(i+1) != aws.ToInt32(num) {
+			t.Errorf("expect %d, got %d", i+1, num)
+		}
+
+		if matched, err := regexp.MatchString(`^ETAG\d+$`, etag); !matched || err != nil {
+			t.Errorf("Failed regexp expression `^ETAG\\d+$`")
+		}
+	}
+
+	// Custom headers
+	cmu := (*args)[0].(*s3.CreateMultipartUploadInput)
+
+	if e, a := types.ServerSideEncryption("aws:kms"), cmu.ServerSideEncryption; e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+
+	if e, a := "KmsId", aws.ToString(cmu.SSEKMSKeyId); e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+
+	if e, a := "content/type", aws.ToString(cmu.ContentType); e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+}
+
+func TestUploadOrderMultiDifferentPartSize(t *testing.T) {
+	c, ops, args := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{
+		PartSizeBytes: 1024 * 1024 * 11,
+		Concurrency:   1,
+	})
+
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(buf20MB),
+	})
+
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	vals := []string{"CreateMultipartUpload", "UploadPart", "UploadPart", "CompleteMultipartUpload"}
+	if !reflect.DeepEqual(vals, *ops) {
+		t.Errorf("expect %v, got %v", vals, *ops)
+	}
+
+	// Part lengths
+	if len := getReaderLength((*args)[1].(*s3.UploadPartInput).Body); 1024*1024*11 != len {
+		t.Errorf("expect %d, got %d", 1024*1024*7, len)
+	}
+	if len := getReaderLength((*args)[2].(*s3.UploadPartInput).Body); 1024*1024*9 != len {
+		t.Errorf("expect %d, got %d", 1024*1024*5, len)
+	}
+}
+
+func TestUploadFailIfPartSizeTooSmall(t *testing.T) {
+	mgr := New(s3.New(s3.Options{}), Options{},
+		func(o *Options) {
+			o.PartSizeBytes = 5
+		})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(buf20MB),
+	})
+
+	if resp != nil {
+		t.Errorf("Expected response to be nil, but received %v", resp)
+	}
+
+	if err == nil {
+		t.Errorf("Expected error, but received nil")
+	}
+	if e, a := "part size must be at least", err.Error(); !strings.Contains(a, e) {
+		t.Errorf("expect %v to be in %v", e, a)
+	}
+}
+
+func TestUploadOrderSingle(t *testing.T) {
+	c, invocations, params := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket:               "Bucket",
+		Key:                  "Key - value",
+		Body:                 bytes.NewReader(buf2MB),
+		ServerSideEncryption: "aws:kms",
+		SSEKMSKeyID:          "KmsId",
+		ContentType:          "content/type",
+	})
+
+	if err != nil {
+		t.Errorf("expect no error but received %v", err)
+	}
+
+	if diff := cmpDiff([]string{"PutObject"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	if e := "VERSION-ID"; e != resp.VersionID {
+		t.Errorf("expect %q, got %q", e, resp.VersionID)
+	}
+
+	if len(resp.UploadID) > 0 {
+		t.Errorf("expect empty string, got %q", resp.UploadID)
+	}
+
+	putObjectInput := (*params)[0].(*s3.PutObjectInput)
+
+	if e, a := types.ServerSideEncryption("aws:kms"), putObjectInput.ServerSideEncryption; e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+
+	if e, a := "KmsId", aws.ToString(putObjectInput.SSEKMSKeyId); e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+
+	if e, a := "content/type", aws.ToString(putObjectInput.ContentType); e != a {
+		t.Errorf("Expected %q, but received %q", e, a)
+	}
+}
+
+func TestUploadSingleFailure(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+
+	c.PutObjectFn = func(*s3testing.UploadLoggingClient, *s3.PutObjectInput) (*s3.PutObjectOutput, error) {
+		return nil, fmt.Errorf("put object failure")
+	}
+
+	mgr := New(c, Options{})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(buf2MB),
+	})
+
+	if err == nil {
+		t.Error("expect error, got nil")
+	}
+
+	if diff := cmpDiff([]string{"PutObject"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	if resp != nil {
+		t.Errorf("expect response to be nil, got %v", resp)
+	}
+}
+
+func TestUploadOrderZero(t *testing.T) {
+	c, invocations, params := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(make([]byte, 0)),
+	})
+
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	if diff := cmpDiff([]string{"PutObject"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	if len(resp.UploadID) > 0 {
+		t.Errorf("expect empty string, got %q", resp.UploadID)
+	}
+
+	if e, a := int64(0), getReaderLength((*params)[0].(*s3.PutObjectInput).Body); e != a {
+		t.Errorf("Expected %d, but received %d", e, a)
+	}
+}
+
+func TestUploadOrderMultiFailure(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+
+	c.UploadPartFn = func(u *s3testing.UploadLoggingClient, params *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
+		if *params.PartNumber == 2 {
+			return nil, fmt.Errorf("an unexpected error")
+		}
+		return &s3.UploadPartOutput{ETag: aws.String(fmt.Sprintf("ETAG%d", u.PartNum))}, nil
+	}
+
+	mgr := New(c, Options{}, func(o *Options) {
+		o.Concurrency = 1
+	})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(buf20MB),
+	})
+
+	if err == nil {
+		t.Error("expect error, got nil")
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart", "AbortMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+func TestUploadOrderMultiFailureOnComplete(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+
+	c.CompleteMultipartUploadFn = func(*s3testing.UploadLoggingClient, *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error) {
+		return nil, fmt.Errorf("complete multipart error")
+	}
+
+	mgr := New(c, Options{}, func(o *Options) {
+		o.Concurrency = 1
+	})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(buf20MB),
+	})
+
+	if err == nil {
+		t.Error("expect error, got nil")
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart", "UploadPart",
+		"CompleteMultipartUpload", "AbortMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+func TestUploadOrderMultiFailureOnCreate(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+
+	c.CreateMultipartUploadFn = func(*s3testing.UploadLoggingClient, *s3.CreateMultipartUploadInput) (*s3.CreateMultipartUploadOutput, error) {
+		return nil, fmt.Errorf("create multipart upload failure")
+	}
+
+	mgr := New(c, Options{})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(make([]byte, 1024*1024*12)),
+	})
+
+	if err == nil {
+		t.Error("expect error, got nil")
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+type failreader struct {
+	times     int
+	failCount int
+}
+
+func (f *failreader) Read(b []byte) (int, error) {
+	f.failCount++
+	if f.failCount >= f.times {
+		return 0, fmt.Errorf("random failure")
+	}
+	return len(b), nil
+}
+
+func TestUploadOrderReadFail1(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &failreader{times: 1},
+	})
+	if err == nil {
+		t.Fatalf("expect error to not be nil")
+	}
+
+	if e, a := "random failure", err.Error(); !strings.Contains(a, e) {
+		t.Errorf("expect %v, got %v", e, a)
+	}
+
+	if diff := cmpDiff([]string(nil), *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+func TestUploadOrderReadFail2(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient([]string{"UploadPart"})
+	mgr := New(c, Options{}, func(o *Options) {
+		o.Concurrency = 1
+	})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &failreader{times: 2},
+	})
+	if err == nil {
+		t.Fatalf("expect error to not be nil")
+	}
+
+	if e, a := "random failure", err.Error(); !strings.Contains(a, e) {
+		t.Errorf("expect %v, got %q", e, a)
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "AbortMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+type sizedReader struct {
+	size int
+	cur  int
+	err  error
+}
+
+func (s *sizedReader) Read(p []byte) (n int, err error) {
+	if s.cur >= s.size {
+		if s.err == nil {
+			s.err = io.EOF
+		}
+		return 0, s.err
+	}
+
+	n = len(p)
+	s.cur += len(p)
+	if s.cur > s.size {
+		n -= s.cur - s.size
+	}
+
+	return n, err
+}
+
+func TestUploadOrderMultiBufferedReader(t *testing.T) {
+	c, invocations, params := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &sizedReader{size: 1024 * 1024 * 21},
+	})
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart",
+		"UploadPart", "CompleteMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	// Part lengths
+	var parts []int64
+	for i := 1; i <= 3; i++ {
+		parts = append(parts, getReaderLength((*params)[i].(*s3.UploadPartInput).Body))
+	}
+	sort.Slice(parts, func(i, j int) bool {
+		return parts[i] < parts[j]
+	})
+
+	if diff := cmpDiff([]int64{1024 * 1024 * 5, 1024 * 1024 * 8, 1024 * 1024 * 8}, parts); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+func TestUploadOrderMultiBufferedReaderPartial(t *testing.T) {
+	c, invocations, params := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &sizedReader{size: 1024 * 1024 * 21, err: io.EOF},
+	})
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart",
+		"UploadPart", "CompleteMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	// Part lengths
+	var parts []int64
+	for i := 1; i <= 3; i++ {
+		parts = append(parts, getReaderLength((*params)[i].(*s3.UploadPartInput).Body))
+	}
+	sort.Slice(parts, func(i, j int) bool {
+		return parts[i] < parts[j]
+	})
+
+	if diff := cmpDiff([]int64{1024 * 1024 * 5, 1024 * 1024 * 8, 1024 * 1024 * 8}, parts); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+// TestUploadOrderMultiBufferedReaderEOF tests the edge case where the
+// file size is the same as part size.
+func TestUploadOrderMultiBufferedReaderEOF(t *testing.T) {
+	c, invocations, params := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &sizedReader{size: 1024 * 1024 * 16, err: io.EOF},
+	})
+
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	if diff := cmpDiff([]string{"CreateMultipartUpload", "UploadPart", "UploadPart", "CompleteMultipartUpload"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	// Part lengths
+	var parts []int64
+	for i := 1; i <= 2; i++ {
+		parts = append(parts, getReaderLength((*params)[i].(*s3.UploadPartInput).Body))
+	}
+	sort.Slice(parts, func(i, j int) bool {
+		return parts[i] < parts[j]
+	})
+
+	if diff := cmpDiff([]int64{1024 * 1024 * 8, 1024 * 1024 * 8}, parts); len(diff) > 0 {
+		t.Error(diff)
+	}
+}
+
+func TestUploadOrderSingleBufferedReader(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   &sizedReader{size: 1024 * 1024 * 2},
+	})
+
+	if err != nil {
+		t.Errorf("expect no error, got %v", err)
+	}
+
+	if diff := cmpDiff([]string{"PutObject"}, *invocations); len(diff) > 0 {
+		t.Error(diff)
+	}
+
+	if len(resp.UploadID) > 0 {
+		t.Errorf("expect no value, got %q", resp.UploadID)
+	}
+}
+
+func TestUploadZeroLenObject(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+
+	mgr := New(c, Options{})
+	resp, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   strings.NewReader(""),
+	})
+
+	if err != nil {
+		t.Errorf("expect no error but received %v", err)
+	}
+	if diff := cmpDiff([]string{"PutObject"}, *invocations); len(diff) > 0 {
+		t.Errorf("expect request to have been made, but was not, %v", diff)
+	}
+
+	if len(resp.UploadID) > 0 {
+		t.Errorf("expect empty string, but received %q", resp.UploadID)
+	}
+}
+
+type testIncompleteReader struct {
+	Size int64
+	read int64
+}
+
+func (r *testIncompleteReader) Read(p []byte) (n int, err error) {
+	r.read += int64(len(p))
+	if r.read >= r.Size {
+		return int(r.read - r.Size), io.ErrUnexpectedEOF
+	}
+	return len(p), nil
+}
+
+func TestUploadUnexpectedEOF(t *testing.T) {
+	c, invocations, _ := s3testing.NewUploadLoggingClient(nil)
+	mgr := New(c, Options{}, func(o *Options) {
+		o.Concurrency = 1
+		o.PartSizeBytes = minPartSizeBytes
+	})
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body: &testIncompleteReader{
+			Size: minPartSizeBytes + 1,
+		},
+	})
+	if err == nil {
+		t.Error("expect error, got nil")
+	}
+
+	// Ensure upload started.
+	if e, a := "CreateMultipartUpload", (*invocations)[0]; e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+
+	// Part may or may not be sent because of timing of sending parts and
+	// reading next part in upload manager. Just check for the last abort.
+	if e, a := "AbortMultipartUpload", (*invocations)[len(*invocations)-1]; e != a {
+		t.Errorf("expect %q, got %q", e, a)
+	}
+}
+
+func TestSSE(t *testing.T) {
+	c, _, _ := s3testing.NewUploadLoggingClient(nil)
+	c.UploadPartFn = func(u *s3testing.UploadLoggingClient, params *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
+		if params.SSECustomerAlgorithm == nil {
+			t.Fatal("SSECustomerAlgoritm should not be nil")
+		}
+		if params.SSECustomerKey == nil {
+			t.Fatal("SSECustomerKey should not be nil")
+		}
+		return &s3.UploadPartOutput{ETag: aws.String(fmt.Sprintf("ETAG%d", u.PartNum))}, nil
+	}
+
+	mgr := New(c, Options{}, func(o *Options) {
+		o.Concurrency = 5
+	})
+
+	_, err := mgr.PutObject(context.Background(), &PutObjectInput{
+		Bucket:               "Bucket",
+		Key:                  "Key",
+		SSECustomerAlgorithm: "AES256",
+		SSECustomerKey:       "foo",
+		Body:                 bytes.NewBuffer(make([]byte, 1024*1024*10)),
+	})
+
+	if err != nil {
+		t.Fatal("Expected no error, but received" + err.Error())
+	}
+}
+
+func TestUploadWithContextCanceled(t *testing.T) {
+	c := s3.New(s3.Options{
+		UsePathStyle: true,
+		Region:       "mock-region",
+	})
+	u := New(c, Options{})
+
+	ctx := &awstesting.FakeContext{DoneCh: make(chan struct{})}
+	ctx.Error = fmt.Errorf("context canceled")
+	close(ctx.DoneCh)
+
+	_, err := u.PutObject(ctx, &PutObjectInput{
+		Bucket: "Bucket",
+		Key:    "Key",
+		Body:   bytes.NewReader(make([]byte, 0)),
+	})
+	if err == nil {
+		t.Fatalf("expect error, got nil")
+	}
+
+	if e, a := "canceled", err.Error(); !strings.Contains(a, e) {
+		t.Errorf("expected error message to contain %q, but did not %q", e, a)
+	}
+}
+
+func TestUploadRetry(t *testing.T) {
+	const part, retries = 3, 10
+	testFile, testFileCleanup, err := createTempFile(t, minPartSizeBytes*part)
+	if err != nil {
+		t.Fatalf("failed to create test file, %v", err)
+	}
+	defer testFileCleanup(t)
+
+	cases := map[string]struct {
+		Body         io.Reader
+		PartHandlers func(testing.TB) []http.Handler
+	}{
+		"bytes.Buffer": {
+			Body: bytes.NewBuffer(make([]byte, minPartSizeBytes*part)),
+			PartHandlers: func(tb testing.TB) []http.Handler {
+				return buildFailHandlers(tb, part, retries)
+			},
+		},
+		"bytes.Reader": {
+			Body: bytes.NewReader(make([]byte, minPartSizeBytes*part)),
+			PartHandlers: func(tb testing.TB) []http.Handler {
+				return buildFailHandlers(tb, part, retries)
+			},
+		},
+		"os.File": {
+			Body: testFile,
+			PartHandlers: func(tb testing.TB) []http.Handler {
+				return buildFailHandlers(tb, part, retries)
+			},
+		},
+	}
+
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			restoreSleep := sdk.TestingUseNopSleep()
+			defer restoreSleep()
+
+			mux := newMockS3UploadServer(t, c.PartHandlers(t))
+			server := httptest.NewServer(mux)
+			defer server.Close()
+
+			client := s3.New(s3.Options{
+				EndpointResolverV2: s3testing.EndpointResolverV2{URL: server.URL},
+				UsePathStyle:       true,
+				Retryer: retry.NewStandard(func(o *retry.StandardOptions) {
+					o.MaxAttempts = retries + 1
+				}),
+			})
+
+			uploader := New(client, Options{})
+			_, err := uploader.PutObject(context.Background(), &PutObjectInput{
+				Bucket: "bucket",
+				Key:    "key",
+				Body:   c.Body,
+			})
+
+			if err != nil {
+				t.Fatalf("expect no error, got %v", err)
+			}
+		})
+	}
+}
+
+func newMockS3UploadServer(tb testing.TB, partHandler []http.Handler) *mockS3UploadServer {
+	s := &mockS3UploadServer{
+		ServeMux:     http.NewServeMux(),
+		partHandlers: partHandler,
+		tb:           tb,
+	}
+
+	s.HandleFunc("/", s.handleRequest)
+
+	return s
+}
+
+func buildFailHandlers(tb testing.TB, part, retry int) []http.Handler {
+	handlers := make([]http.Handler, part)
+
+	for i := 0; i < part; i++ {
+		handlers[i] = &failPartHandler{
+			tb:                 tb,
+			failLeft:           retry,
+			successPartHandler: &successPartHandler{tb: tb},
+		}
+	}
+
+	return handlers
+}
+
+type mockS3UploadServer struct {
+	*http.ServeMux
+
+	tb           testing.TB
+	partHandlers []http.Handler
+}
+
+func (s mockS3UploadServer) handleRequest(w http.ResponseWriter, r *http.Request) {
+	defer func() {
+		if err := r.Body.Close(); err != nil {
+			failRequest(w, 0, "BodyCloseError", fmt.Sprintf("request body close error: %v", err))
+		}
+	}()
+
+	_, hasUploads := r.URL.Query()["uploads"]
+
+	switch {
+	case r.Method == "POST" && hasUploads:
+		// CreateMultipartUpload request
+		w.Header().Set("Content-Length", strconv.Itoa(len(createUploadResp)))
+		w.Write([]byte(createUploadResp))
+	case r.Method == "PUT":
+		partStr := r.URL.Query().Get("partNumber")
+		part, err := strconv.ParseInt(partStr, 10, 64)
+		if err != nil {
+			failRequest(w, 400, "BadRequest", fmt.Sprintf("unable to parse partNumber, %q, %v", partStr, err))
+			return
+		}
+		if part <= 0 || part > int64(len(s.partHandlers)) {
+			failRequest(w, 400, "BadRequest", fmt.Sprintf("invalid partNumber %v", part))
+			return
+		}
+		s.partHandlers[part-1].ServeHTTP(w, r)
+	case r.Method == "POST":
+		// CompleteMultipartUpload request
+		w.Header().Set("Content-Length", strconv.Itoa(len(completeUploadResp)))
+		w.Write([]byte(completeUploadResp))
+	case r.Method == "DELETE":
+		w.Header().Set("Content-Length", strconv.Itoa(len(abortUploadResp)))
+		w.Write([]byte(abortUploadResp))
+		w.WriteHeader(200)
+	default:
+		failRequest(w, 400, "BadRequest", fmt.Sprintf("invalid request %v %v", r.Method, r.URL))
+	}
+}
+
+func createTempFile(t *testing.T, size int64) (*os.File, func(*testing.T), error) {
+	file, err := ioutil.TempFile(os.TempDir(), aws.SDKName+t.Name())
+	if err != nil {
+		return nil, nil, err
+	}
+	filename := file.Name()
+	if err := file.Truncate(size); err != nil {
+		return nil, nil, err
+	}
+
+	return file,
+		func(t *testing.T) {
+			if err := file.Close(); err != nil {
+				t.Errorf("failed to close temp file, %s, %v", filename, err)
+			}
+			if err := os.Remove(filename); err != nil {
+				t.Errorf("failed to remove temp file, %s, %v", filename, err)
+			}
+		},
+		nil
+}
+
+type failPartHandler struct {
+	tb                 testing.TB
+	failLeft           int
+	successPartHandler http.Handler
+}
+
+func (h *failPartHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	defer func() {
+		if err := r.Body.Close(); err != nil {
+			failRequest(w, 0, "BodyCloseError", fmt.Sprintf("request body close error: %v", err))
+		}
+	}()
+
+	if h.failLeft == 0 && h.successPartHandler != nil {
+		h.successPartHandler.ServeHTTP(w, r)
+		return
+	}
+
+	io.Copy(ioutil.Discard, r.Body)
+	failRequest(w, 500, "InternalException", fmt.Sprintf("mock error, partNumber %v", r.URL.Query().Get("partNumber")))
+	h.failLeft--
+}
+
+func failRequest(w http.ResponseWriter, status int, code, msg string) {
+	msg = fmt.Sprintf(baseRequestErrorResp, code, msg)
+	w.Header().Set("Content-Length", strconv.Itoa(len(msg)))
+	w.WriteHeader(status)
+	w.Write([]byte(msg))
+}
+
+type successPartHandler struct {
+	tb testing.TB
+}
+
+func (h *successPartHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	defer func() {
+		if err := r.Body.Close(); err != nil {
+			failRequest(w, 0, "BodyCloseError", fmt.Sprintf("request body close error: %v", err))
+		}
+	}()
+
+	n, err := io.Copy(ioutil.Discard, r.Body)
+	if err != nil {
+		failRequest(w, 400, "BadRequest", fmt.Sprintf("failed to read body, %v", err))
+		return
+	}
+	contentLength := r.Header.Get("Content-Length")
+	expectLength, err := strconv.ParseInt(contentLength, 10, 64)
+	if err != nil {
+		h.tb.Logf("expect content-length, got %q, %v", contentLength, err)
+		failRequest(w, 400, "BadRequest", fmt.Sprintf("unable to get content-length %v", err))
+		return
+	}
+
+	if e, a := expectLength, n; e != a {
+		h.tb.Logf("expect content-length to be %v, got %v", e, a)
+		failRequest(w, 400, "BadRequest", fmt.Sprintf("content-length and body do not match, %v, %v", e, a))
+		return
+	}
+
+	w.Header().Set("Content-Length", strconv.Itoa(len(uploadPartResp)))
+	w.Write([]byte(uploadPartResp))
+}
+
+const createUploadResp = `<CreateMultipartUploadResponse>
+  <Bucket>bucket</Bucket>
+  <Key>key</Key>
+  <UploadId>abc123</UploadId>
+</CreateMultipartUploadResponse>`
+
+const uploadPartResp = `<UploadPartResponse>
+  <ETag>key</ETag>
+</UploadPartResponse>`
+const baseRequestErrorResp = `<batchItemError>
+  <Code>%s</Code>
+  <Message>%s</Message>
+  <RequestId>request-id</RequestId>
+  <HostId>host-id</HostId>
+</batchItemError>`
+
+const completeUploadResp = `<CompleteMultipartUploadResponse>
+  <Bucket>bucket</Bucket>
+  <Key>key</Key>
+  <ETag>key</ETag>
+  <Location>https://bucket.us-west-2.amazonaws.com/key</Location>
+  <UploadId>abc123</UploadId>
+</CompleteMultipartUploadResponse>`
+
+const abortUploadResp = `<AbortMultipartUploadResponse></AbortMultipartUploadResponse>`
+
+func cmpDiff(e, a interface{}) string {
+	if !reflect.DeepEqual(e, a) {
+		return fmt.Sprintf("%v != %v", e, a)
+	}
+	return ""
+}
diff --git a/feature/s3/transfermanager/rrdns.go b/feature/s3/transfermanager/rrdns.go
new file mode 100644
index 00000000000..7fac93a17df
--- /dev/null
+++ b/feature/s3/transfermanager/rrdns.go
@@ -0,0 +1,160 @@
+package transfermanager
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/internal/sync/singleflight"
+)
+
+var timeNow = time.Now
+
+// WithRoundRobinDNS configures an http.Transport to spread HTTP connections
+// across multiple IP addresses for a given host.
+//
+// This is recommended by the [S3 performance guide] in high-concurrency
+// application environments.
+//
+// WithRoundRobinDNS wraps the underlying DialContext hook on http.Transport.
+// Future modifications to this hook MUST preserve said wrapping in order for
+// round-robin DNS to operate.
+//
+// [S3 performance guide]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/optimizing-performance-design-patterns.html
+func WithRoundRobinDNS(opts ...func(*RoundRobinDNSOptions)) func(*http.Transport) {
+	options := &RoundRobinDNSOptions{
+		TTL:      30 * time.Second,
+		MaxHosts: 100,
+	}
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return func(t *http.Transport) {
+		rr := &rrDNS{
+			cache:       newDNSCache(options.MaxHosts),
+			expiry:      options.TTL,
+			resolver:    &net.Resolver{},
+			dialContext: t.DialContext,
+		}
+		t.DialContext = rr.DialContext
+	}
+}
+
+// RoundRobinDNSOptions configures use of round-robin DNS.
+type RoundRobinDNSOptions struct {
+	// The length of time for which the results of a DNS query are valid.
+	TTL time.Duration
+
+	// A limit to the number of DNS query results, cached by hostname, which are
+	// stored. Round-robin DNS uses an LRU cache.
+	MaxHosts int
+}
+
+type resolver interface {
+	LookupHost(context.Context, string) ([]string, error)
+}
+
+type rrDNS struct {
+	sf    singleflight.Group
+	cache *dnsCache
+
+	expiry   time.Duration
+	resolver resolver
+
+	dialContext func(ctx context.Context, network, addr string) (net.Conn, error)
+}
+
+// DialContext implements the DialContext hook used by http.Transport,
+// pre-caching IP addresses for a given host and distributing them evenly
+// across new connections.
+func (r *rrDNS) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return nil, fmt.Errorf("rrdns split host/port: %w", err)
+	}
+
+	ipaddr, err := r.getAddr(ctx, host)
+	if err != nil {
+		return nil, fmt.Errorf("rrdns lookup host: %w", err)
+	}
+
+	return r.dialContext(ctx, network, net.JoinHostPort(ipaddr, port))
+}
+
+func (r *rrDNS) getAddr(ctx context.Context, host string) (string, error) {
+	addr, ok := r.cache.GetAddr(host)
+	if ok {
+		return addr, nil
+	}
+	return r.lookupHost(ctx, host)
+}
+
+func (r *rrDNS) lookupHost(ctx context.Context, host string) (string, error) {
+	ch := r.sf.DoChan(host, func() (interface{}, error) {
+		addrs, err := r.resolver.LookupHost(ctx, host)
+		if err != nil {
+			return nil, err
+		}
+
+		expires := timeNow().Add(r.expiry)
+		r.cache.PutAddrs(host, addrs, expires)
+		return nil, nil
+	})
+
+	select {
+	case result := <-ch:
+		if result.Err != nil {
+			return "", result.Err
+		}
+
+		addr, _ := r.cache.GetAddr(host)
+		return addr, nil
+	case <-ctx.Done():
+		return "", ctx.Err()
+	}
+}
+
+// WithRotoDialer configures an http.Transport to cycle through multiple local
+// network addresses when creating new HTTP connections.
+//
+// WithRotoDialer REPLACES the root DialContext hook on the underlying
+// Transport, thereby destroying any previously-applied wrappings around it. If
+// the caller needs to apply additional decorations to the DialContext hook,
+// they must do so after applying WithRotoDialer.
+func WithRotoDialer(addrs []net.Addr) func(*http.Transport) {
+	return func(t *http.Transport) {
+		var dialers []*net.Dialer
+		for _, addr := range addrs {
+			dialers = append(dialers, &net.Dialer{
+				LocalAddr: addr,
+			})
+		}
+
+		t.DialContext = (&rotoDialer{
+			dialers: dialers,
+		}).DialContext
+	}
+}
+
+type rotoDialer struct {
+	mu      sync.Mutex
+	dialers []*net.Dialer
+	index   int
+}
+
+func (r *rotoDialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
+	return r.next().DialContext(ctx, network, addr)
+}
+
+func (r *rotoDialer) next() *net.Dialer {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	d := r.dialers[r.index]
+	r.index = (r.index + 1) % len(r.dialers)
+	return d
+}
diff --git a/feature/s3/transfermanager/rrdns_test.go b/feature/s3/transfermanager/rrdns_test.go
new file mode 100644
index 00000000000..c6e31c0cb28
--- /dev/null
+++ b/feature/s3/transfermanager/rrdns_test.go
@@ -0,0 +1,166 @@
+package transfermanager
+
+import (
+	"context"
+	"errors"
+	"net"
+	"testing"
+	"time"
+)
+
+// these tests also cover the cache impl (cycling+expiry+evict)
+
+type mockNow struct {
+	now time.Time
+}
+
+func (m *mockNow) Now() time.Time {
+	return m.now
+}
+
+func (m *mockNow) Add(d time.Duration) {
+	m.now = m.now.Add(d)
+}
+
+func useMockNow(m *mockNow) func() {
+	timeNow = m.Now
+	return func() {
+		timeNow = time.Now
+	}
+}
+
+var errDialContextOK = errors.New("dial context ok")
+
+type mockResolver struct {
+	addrs map[string][]string
+	err   error
+}
+
+func (m *mockResolver) LookupHost(ctx context.Context, host string) ([]string, error) {
+	return m.addrs[host], m.err
+}
+
+type mockDialContext struct {
+	calledWith string
+}
+
+func (m *mockDialContext) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
+	m.calledWith = addr
+	return nil, errDialContextOK
+}
+
+func TestRoundRobinDNS_CycleIPs(t *testing.T) {
+	restore := useMockNow(&mockNow{})
+	defer restore()
+
+	addrs := []string{"0.0.0.1", "0.0.0.2", "0.0.0.3"}
+	r := &mockResolver{
+		addrs: map[string][]string{
+			"s3.us-east-1.amazonaws.com": addrs,
+		},
+	}
+	dc := &mockDialContext{}
+
+	rr := &rrDNS{
+		cache:       newDNSCache(1),
+		resolver:    r,
+		dialContext: dc.DialContext,
+	}
+
+	expectDialContext(t, rr, dc, "s3.us-east-1.amazonaws.com", addrs[0])
+	expectDialContext(t, rr, dc, "s3.us-east-1.amazonaws.com", addrs[1])
+	expectDialContext(t, rr, dc, "s3.us-east-1.amazonaws.com", addrs[2])
+	expectDialContext(t, rr, dc, "s3.us-east-1.amazonaws.com", addrs[0])
+}
+
+func TestRoundRobinDNS_MultiIP(t *testing.T) {
+	restore := useMockNow(&mockNow{})
+	defer restore()
+
+	r := &mockResolver{
+		addrs: map[string][]string{
+			"host1.com": {"0.0.0.1", "0.0.0.2", "0.0.0.3"},
+			"host2.com": {"1.0.0.1", "1.0.0.2", "1.0.0.3"},
+		},
+	}
+	dc := &mockDialContext{}
+
+	rr := &rrDNS{
+		cache:       newDNSCache(2),
+		resolver:    r,
+		dialContext: dc.DialContext,
+	}
+
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][0])
+	expectDialContext(t, rr, dc, "host2.com", r.addrs["host2.com"][0])
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][1])
+	expectDialContext(t, rr, dc, "host2.com", r.addrs["host2.com"][1])
+}
+
+func TestRoundRobinDNS_MaxHosts(t *testing.T) {
+	restore := useMockNow(&mockNow{})
+	defer restore()
+
+	r := &mockResolver{
+		addrs: map[string][]string{
+			"host1.com": {"0.0.0.1", "0.0.0.2", "0.0.0.3"},
+			"host2.com": {"0.0.0.1", "0.0.0.2", "0.0.0.3"},
+		},
+	}
+	dc := &mockDialContext{}
+
+	rr := &rrDNS{
+		cache:       newDNSCache(1),
+		resolver:    r,
+		dialContext: dc.DialContext,
+	}
+
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][0])
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][1])
+	expectDialContext(t, rr, dc, "host2.com", r.addrs["host2.com"][0]) // evicts host1
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][0]) // evicts host2
+	expectDialContext(t, rr, dc, "host2.com", r.addrs["host2.com"][0])
+}
+
+func TestRoundRobinDNS_Expires(t *testing.T) {
+	now := &mockNow{time.Unix(0, 0)}
+	restore := useMockNow(now)
+	defer restore()
+
+	r := &mockResolver{
+		addrs: map[string][]string{
+			"host1.com": {"0.0.0.1", "0.0.0.2", "0.0.0.3"},
+		},
+	}
+	dc := &mockDialContext{}
+
+	rr := &rrDNS{
+		cache:       newDNSCache(2),
+		expiry:      30,
+		resolver:    r,
+		dialContext: dc.DialContext,
+	}
+
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][0])
+	now.Add(16) // hasn't expired
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][1])
+	now.Add(16) // expired, starts over
+	expectDialContext(t, rr, dc, "host1.com", r.addrs["host1.com"][0])
+}
+
+func expectDialContext(t *testing.T, rr *rrDNS, dc *mockDialContext, host, expect string) {
+	const port = "443"
+
+	t.Helper()
+	_, err := rr.DialContext(context.Background(), "", net.JoinHostPort(host, port))
+	if err != errDialContextOK {
+		t.Errorf("expect sentinel err, got %v", err)
+	}
+	actual, _, err := net.SplitHostPort(dc.calledWith)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if expect != actual {
+		t.Errorf("expect addr %s, got %s", expect, actual)
+	}
+}
diff --git a/feature/s3/transfermanager/setup_integ_test.go b/feature/s3/transfermanager/setup_integ_test.go
new file mode 100644
index 00000000000..d8efb29a220
--- /dev/null
+++ b/feature/s3/transfermanager/setup_integ_test.go
@@ -0,0 +1,440 @@
+//go:build integration
+// +build integration
+
+package transfermanager
+
+import (
+	"bytes"
+	"context"
+	"crypto/rand"
+	"crypto/tls"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/aws/aws-sdk-go-v2/service/sts"
+)
+
+var setupMetadata = struct {
+	AccountID string
+	Region    string
+	Buckets   struct {
+		Source struct {
+			Name string
+			ARN  string
+		}
+	}
+}{}
+
+// s3 client to use for integ testing
+var s3Client *s3.Client
+
+// s3TransferManagerClient to use for integ testing
+var s3TransferManagerClient *Client
+
+// sts client to use for integ testing
+var stsClient *sts.Client
+
+// http client setting to use for integ testing
+var httpClient *http.Client
+
+var region = "us-west-2"
+
+// large object buffer to test multipart upload
+var largeObjectBuf []byte
+
+// TestMain executes at start of package tests
+func TestMain(m *testing.M) {
+	flag.Parse()
+	flag.CommandLine.Visit(func(f *flag.Flag) {
+		if !(f.Name == "run" || f.Name == "test.run") {
+			return
+		}
+		value := f.Value.String()
+		if value == `NONE` {
+			os.Exit(0)
+		}
+	})
+
+	var result int
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Fprintln(os.Stderr, "S3 TransferManager integration tests panic,", r)
+			result = 1
+		}
+		os.Exit(result)
+	}()
+
+	var verifyTLS bool
+	var s3Endpoint string
+
+	flag.StringVar(&s3Endpoint, "s3-endpoint", "", "integration endpoint for S3")
+
+	flag.StringVar(&setupMetadata.AccountID, "account", "", "integration account id")
+	flag.BoolVar(&verifyTLS, "verify-tls", true, "verify server TLS certificate")
+	flag.Parse()
+
+	httpClient = &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: verifyTLS},
+		},
+	}
+
+	cfg, err := config.LoadDefaultConfig(context.Background(),
+		config.WithRegion(region))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error occurred while loading config with region %v, %v", region, err)
+		result = 1
+		return
+	}
+
+	// assign the http client
+	cfg.HTTPClient = httpClient
+
+	// create a s3 client
+	s3cfg := cfg.Copy()
+	if len(s3Endpoint) != 0 {
+		s3cfg.EndpointResolver = aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) {
+			return aws.Endpoint{
+				URL:           s3Endpoint,
+				PartitionID:   "aws",
+				SigningName:   "s3",
+				SigningRegion: region,
+				SigningMethod: "s3v4",
+			}, nil
+		})
+	}
+
+	// build s3 client from config
+	s3Client = s3.NewFromConfig(s3cfg)
+
+	// build s3 transfermanager client from config
+	s3TransferManagerClient = NewFromConfig(s3Client, s3cfg)
+
+	// build sts client from config
+	stsClient = sts.NewFromConfig(cfg)
+
+	// context
+	ctx := context.Background()
+
+	setupMetadata.AccountID, err = getAccountID(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to get integration aws account id: %v\n", err)
+		result = 1
+		return
+	}
+
+	bucketCleanup, err := setupBuckets(ctx)
+	defer bucketCleanup()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to setup integration test buckets: %v\n", err)
+		result = 1
+		return
+	}
+
+	largeObjectBuf = make([]byte, 20*1024*1024)
+	_, err = rand.Read(largeObjectBuf)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to generate large object for multipart upload: %v\n", err)
+		result = 1
+		return
+	}
+
+	result = m.Run()
+}
+
+// getAccountID retrieves account id
+func getAccountID(ctx context.Context) (string, error) {
+	if len(setupMetadata.AccountID) != 0 {
+		return setupMetadata.AccountID, nil
+	}
+	identity, err := stsClient.GetCallerIdentity(ctx, nil)
+	if err != nil {
+		return "", fmt.Errorf("error fetching caller identity, %w", err)
+	}
+	return *identity.Account, nil
+}
+
+// setupBuckets creates buckets needed for integration test
+func setupBuckets(ctx context.Context) (func(), error) {
+	var cleanups []func()
+
+	cleanup := func() {
+		for i := range cleanups {
+			cleanups[i]()
+		}
+	}
+
+	bucketCreates := []struct {
+		name *string
+		arn  *string
+	}{
+		{name: &setupMetadata.Buckets.Source.Name, arn: &setupMetadata.Buckets.Source.ARN},
+	}
+
+	for _, bucket := range bucketCreates {
+		*bucket.name = GenerateBucketName()
+
+		if err := SetupBucket(ctx, s3Client, *bucket.name); err != nil {
+			return cleanup, err
+		}
+
+		// Compute ARN
+		bARN := arn.ARN{
+			Partition: "aws",
+			Service:   "s3",
+			Region:    region,
+			AccountID: setupMetadata.AccountID,
+			Resource:  fmt.Sprintf("bucket_name:%s", *bucket.name),
+		}.String()
+
+		*bucket.arn = bARN
+
+		bucketName := *bucket.name
+		cleanups = append(cleanups, func() {
+			if err := CleanupBucket(ctx, s3Client, bucketName); err != nil {
+				fmt.Fprintln(os.Stderr, err)
+			}
+		})
+	}
+
+	return cleanup, nil
+}
+
+type putObjectTestData struct {
+	Body        io.Reader
+	ExpectBody  []byte
+	ExpectError string
+}
+
+// UniqueID returns a unique UUID-like identifier for use in generating
+// resources for integration tests.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func UniqueID() string {
+	uuid := make([]byte, 16)
+	io.ReadFull(rand.Reader, uuid)
+	return fmt.Sprintf("%x", uuid)
+}
+
+func testPutObject(t *testing.T, bucket string, testData putObjectTestData, opts ...func(options *Options)) {
+	key := UniqueID()
+
+	_, err := s3TransferManagerClient.PutObject(context.Background(),
+		&PutObjectInput{
+			Bucket: bucket,
+			Key:    key,
+			Body:   testData.Body,
+		}, opts...)
+	if err != nil {
+		if len(testData.ExpectError) == 0 {
+			t.Fatalf("expect no error, got %v", err)
+		}
+		if e, a := testData.ExpectError, err.Error(); !strings.Contains(a, e) {
+			t.Fatalf("expect error to contain %v, got %v", e, a)
+		}
+	} else {
+		if e := testData.ExpectError; len(e) != 0 {
+			t.Fatalf("expect error: %v, got none", e)
+		}
+	}
+
+	if len(testData.ExpectError) != 0 {
+		return
+	}
+
+	resp, err := s3Client.GetObject(context.Background(),
+		&s3.GetObjectInput{
+			Bucket: aws.String(bucket),
+			Key:    aws.String(key),
+		})
+	if err != nil {
+		t.Fatalf("expect no error, got %v", err)
+	}
+
+	b, _ := ioutil.ReadAll(resp.Body)
+	if e, a := testData.ExpectBody, b; !bytes.EqualFold(e, a) {
+		t.Errorf("expect %s, got %s", e, a)
+	}
+}
+
+// TODO: duped from service/internal/integrationtest, remove after beta.
+const expressAZID = "usw2-az3"
+
+// TODO: duped from service/internal/integrationtest, remove after beta.
+const expressSuffix = "--usw2-az3--x-s3"
+
+// BucketPrefix is the root prefix of integration test buckets.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+const BucketPrefix = "aws-sdk-go-v2-integration"
+
+// GenerateBucketName returns a unique bucket name.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func GenerateBucketName() string {
+	return fmt.Sprintf("%s-%s",
+		BucketPrefix, UniqueID())
+}
+
+// GenerateBucketName returns a unique express-formatted bucket name.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func GenerateExpressBucketName() string {
+	return fmt.Sprintf(
+		"%s-%s%s",
+		BucketPrefix,
+		UniqueID()[0:8], // express suffix adds length, regain that here
+		expressSuffix,
+	)
+}
+
+// SetupBucket returns a test bucket created for the integration tests.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func SetupBucket(ctx context.Context, svc *s3.Client, bucketName string) (err error) {
+	fmt.Println("Setup: Creating test bucket,", bucketName)
+	_, err = svc.CreateBucket(ctx, &s3.CreateBucketInput{
+		Bucket: &bucketName,
+		CreateBucketConfiguration: &types.CreateBucketConfiguration{
+			LocationConstraint: "us-west-2",
+		},
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create bucket %s, %v", bucketName, err)
+	}
+
+	// TODO: change this to use waiter to wait until BucketExists instead of loop
+	// 	svc.WaitUntilBucketExists(HeadBucketInput)
+
+	// HeadBucket to determine if bucket exists
+	var attempt = 0
+	params := &s3.HeadBucketInput{
+		Bucket: &bucketName,
+	}
+pt:
+	_, err = svc.HeadBucket(ctx, params)
+	// increment an attempt
+	attempt++
+
+	// retry till 10 attempt
+	if err != nil {
+		if attempt < 10 {
+			goto pt
+		}
+		// fail if not succeed after 10 attempts
+		return fmt.Errorf("failed to determine if a bucket %s exists and you have permission to access it %v", bucketName, err)
+	}
+
+	return nil
+}
+
+// CleanupBucket deletes the contents of a S3 bucket, before deleting the bucket
+// it self.
+// TODO: list and delete methods should use paginators
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func CleanupBucket(ctx context.Context, svc *s3.Client, bucketName string) (err error) {
+	var errs = make([]error, 0)
+
+	fmt.Println("TearDown: Deleting objects from test bucket,", bucketName)
+	listObjectsResp, err := svc.ListObjectsV2(ctx, &s3.ListObjectsV2Input{
+		Bucket: &bucketName,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to list objects, %w", err)
+	}
+
+	for _, o := range listObjectsResp.Contents {
+		_, err := svc.DeleteObject(ctx, &s3.DeleteObjectInput{
+			Bucket: &bucketName,
+			Key:    o.Key,
+		})
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	if len(errs) != 0 {
+		return fmt.Errorf("failed to delete objects, %s", errs)
+	}
+
+	fmt.Println("TearDown: Deleting partial uploads from test bucket,", bucketName)
+	multipartUploadResp, err := svc.ListMultipartUploads(ctx, &s3.ListMultipartUploadsInput{
+		Bucket: &bucketName,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to list multipart objects, %w", err)
+	}
+
+	for _, u := range multipartUploadResp.Uploads {
+		_, err = svc.AbortMultipartUpload(ctx, &s3.AbortMultipartUploadInput{
+			Bucket:   &bucketName,
+			Key:      u.Key,
+			UploadId: u.UploadId,
+		})
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	if len(errs) != 0 {
+		return fmt.Errorf("failed to delete multipart upload objects, %s", errs)
+	}
+
+	fmt.Println("TearDown: Deleting test bucket,", bucketName)
+	_, err = svc.DeleteBucket(ctx, &s3.DeleteBucketInput{
+		Bucket: &bucketName,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to delete bucket, %s", bucketName)
+	}
+
+	return nil
+}
+
+// SetupExpressBucket returns an express bucket for testing.
+//
+// TODO: duped from service/internal/integrationtest, remove after beta.
+func SetupExpressBucket(ctx context.Context, svc *s3.Client, bucketName string) error {
+	if !strings.HasSuffix(bucketName, expressSuffix) {
+		return fmt.Errorf("bucket name %s is missing required suffix %s", bucketName, expressSuffix)
+	}
+
+	fmt.Println("Setup: Creating test express bucket,", bucketName)
+	_, err := svc.CreateBucket(ctx, &s3.CreateBucketInput{
+		Bucket: &bucketName,
+		CreateBucketConfiguration: &types.CreateBucketConfiguration{
+			Location: &types.LocationInfo{
+				Name: aws.String(expressAZID),
+				Type: types.LocationTypeAvailabilityZone,
+			},
+			Bucket: &types.BucketInfo{
+				DataRedundancy: types.DataRedundancySingleAvailabilityZone,
+				Type:           types.BucketTypeDirectory,
+			},
+		},
+	})
+	if err != nil {
+		return fmt.Errorf("create express bucket %s: %v", bucketName, err)
+	}
+
+	w := s3.NewBucketExistsWaiter(svc)
+	err = w.Wait(ctx, &s3.HeadBucketInput{
+		Bucket: &bucketName,
+	}, 10*time.Second)
+	if err != nil {
+		return fmt.Errorf("wait for express bucket %s: %v", bucketName, err)
+	}
+
+	return nil
+}
diff --git a/feature/s3/transfermanager/shared_test.go b/feature/s3/transfermanager/shared_test.go
new file mode 100644
index 00000000000..364423e96c2
--- /dev/null
+++ b/feature/s3/transfermanager/shared_test.go
@@ -0,0 +1,4 @@
+package transfermanager
+
+var buf20MB = make([]byte, 1024*1024*20)
+var buf2MB = make([]byte, 1024*1024*2)
diff --git a/feature/s3/transfermanager/types/types.go b/feature/s3/transfermanager/types/types.go
new file mode 100644
index 00000000000..8a2d877e461
--- /dev/null
+++ b/feature/s3/transfermanager/types/types.go
@@ -0,0 +1,346 @@
+package types
+
+import (
+	"io"
+
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+)
+
+// ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser. Allows the
+// SDK to accept an io.Reader that is not also an io.Seeker for unsigned
+// streaming payload API operations.
+//
+// A readSeekCloser wrapping an nonseekable io.Reader used in an API operation's
+// input will prevent that operation being retried in the case of
+// network errors, and cause operation requests to fail if the operation
+// requires payload signing.
+func ReadSeekCloser(r io.Reader) *ReaderSeekerCloser {
+	return &ReaderSeekerCloser{r}
+}
+
+// ReaderSeekerCloser represents a reader that can also delegate io.Seeker and
+// io.Closer interfaces to the underlying object if they are available.
+type ReaderSeekerCloser struct {
+	r io.Reader
+}
+
+// SeekerLen attempts to get the number of bytes remaining at the seeker's
+// current position.  Returns the number of bytes remaining or error.
+func SeekerLen(s io.Seeker) (int64, error) {
+	// Determine if the seeker is actually seekable. ReaderSeekerCloser
+	// hides the fact that a io.Readers might not actually be seekable.
+	switch v := s.(type) {
+	case *ReaderSeekerCloser:
+		return v.GetLen()
+	}
+
+	return computeSeekerLength(s)
+}
+
+// GetLen returns the length of the bytes remaining in the underlying reader.
+// Checks first for Len(), then io.Seeker to determine the size of the
+// underlying reader.
+//
+// Will return -1 if the length cannot be determined.
+func (r *ReaderSeekerCloser) GetLen() (int64, error) {
+	if l, ok := r.HasLen(); ok {
+		return int64(l), nil
+	}
+
+	if s, ok := r.r.(io.Seeker); ok {
+		return computeSeekerLength(s)
+	}
+
+	return -1, nil
+}
+
+func computeSeekerLength(s io.Seeker) (int64, error) {
+	curOffset, err := s.Seek(0, io.SeekCurrent)
+	if err != nil {
+		return 0, err
+	}
+
+	endOffset, err := s.Seek(0, io.SeekEnd)
+	if err != nil {
+		return 0, err
+	}
+
+	_, err = s.Seek(curOffset, io.SeekStart)
+	if err != nil {
+		return 0, err
+	}
+
+	return endOffset - curOffset, nil
+}
+
+// HasLen returns the length of the underlying reader if the value implements
+// the Len() int method.
+func (r *ReaderSeekerCloser) HasLen() (int, bool) {
+	type lenner interface {
+		Len() int
+	}
+
+	if lr, ok := r.r.(lenner); ok {
+		return lr.Len(), true
+	}
+
+	return 0, false
+}
+
+// Read reads from the reader up to size of p. The number of bytes read, and
+// error if it occurred will be returned.
+//
+// If the reader is not an io.Reader zero bytes read, and nil error will be
+// returned.
+//
+// Performs the same functionality as io.Reader Read
+func (r *ReaderSeekerCloser) Read(p []byte) (int, error) {
+	switch t := r.r.(type) {
+	case io.Reader:
+		return t.Read(p)
+	}
+	return 0, nil
+}
+
+// Seek sets the offset for the next Read to offset, interpreted according to
+// whence: 0 means relative to the origin of the file, 1 means relative to the
+// current offset, and 2 means relative to the end. Seek returns the new offset
+// and an error, if any.
+//
+// If the ReaderSeekerCloser is not an io.Seeker nothing will be done.
+func (r *ReaderSeekerCloser) Seek(offset int64, whence int) (int64, error) {
+	switch t := r.r.(type) {
+	case io.Seeker:
+		return t.Seek(offset, whence)
+	}
+	return int64(0), nil
+}
+
+// IsSeeker returns if the underlying reader is also a seeker.
+func (r *ReaderSeekerCloser) IsSeeker() bool {
+	_, ok := r.r.(io.Seeker)
+	return ok
+}
+
+// Close closes the ReaderSeekerCloser.
+//
+// If the ReaderSeekerCloser is not an io.Closer nothing will be done.
+func (r *ReaderSeekerCloser) Close() error {
+	switch t := r.r.(type) {
+	case io.Closer:
+		return t.Close()
+	}
+	return nil
+}
+
+// ChecksumAlgorithm indicates the algorithm used to create the checksum for the object
+type ChecksumAlgorithm string
+
+// Enum values for ChecksumAlgorithm
+const (
+	ChecksumAlgorithmCrc32  ChecksumAlgorithm = "CRC32"
+	ChecksumAlgorithmCrc32c                   = "CRC32C"
+	ChecksumAlgorithmSha1                     = "SHA1"
+	ChecksumAlgorithmSha256                   = "SHA256"
+)
+
+// ObjectCannedACL defines the canned ACL to apply to the object, see [Canned ACL] in the
+// Amazon S3 User Guide.
+type ObjectCannedACL string
+
+// Enum values for ObjectCannedACL
+const (
+	ObjectCannedACLPrivate                ObjectCannedACL = "private"
+	ObjectCannedACLPublicRead                             = "public-read"
+	ObjectCannedACLPublicReadWrite                        = "public-read-write"
+	ObjectCannedACLAuthenticatedRead                      = "authenticated-read"
+	ObjectCannedACLAwsExecRead                            = "aws-exec-read"
+	ObjectCannedACLBucketOwnerRead                        = "bucket-owner-read"
+	ObjectCannedACLBucketOwnerFullControl                 = "bucket-owner-full-control"
+)
+
+// Values returns all known values for ObjectCannedACL. Note that this can be
+// expanded in the future, and so it is only as up to date as the client.
+//
+// The ordering of this slice is not guaranteed to be stable across updates.
+func (ObjectCannedACL) Values() []ObjectCannedACL {
+	return []ObjectCannedACL{
+		"private",
+		"public-read",
+		"public-read-write",
+		"authenticated-read",
+		"aws-exec-read",
+		"bucket-owner-read",
+		"bucket-owner-full-control",
+	}
+}
+
+// ObjectLockLegalHoldStatus specifies whether a legal hold will be applied to this object. For more
+// information about S3 Object Lock, see [Object Lock] in the Amazon S3 User Guide.
+type ObjectLockLegalHoldStatus string
+
+// Enum values for ObjectLockLegalHoldStatus
+const (
+	ObjectLockLegalHoldStatusOn  ObjectLockLegalHoldStatus = "ON"
+	ObjectLockLegalHoldStatusOff                           = "OFF"
+)
+
+// ObjectLockMode is the Object Lock mode that you want to apply to this object.
+type ObjectLockMode string
+
+// Enum values for ObjectLockMode
+const (
+	ObjectLockModeGovernance ObjectLockMode = "GOVERNANCE"
+	ObjectLockModeCompliance                = "COMPLIANCE"
+)
+
+// RequestPayer confirms that the requester knows that they will be charged for the request.
+// Bucket owners need not specify this parameter in their requests. If either the
+// source or destination S3 bucket has Requester Pays enabled, the requester will
+// pay for corresponding charges to copy the object. For information about
+// downloading objects from Requester Pays buckets, see [Downloading Objects in Requester Pays Buckets]in the Amazon S3 User
+// Guide.
+type RequestPayer string
+
+// Enum values for RequestPayer
+const (
+	RequestPayerRequester RequestPayer = "requester"
+)
+
+// ServerSideEncryption indicates the server-side encryption algorithm that was used when you store this object
+// in Amazon S3 (for example, AES256 , aws:kms , aws:kms:dsse )
+type ServerSideEncryption string
+
+// Enum values for ServerSideEncryption
+const (
+	ServerSideEncryptionAes256     ServerSideEncryption = "AES256"
+	ServerSideEncryptionAwsKms                          = "aws:kms"
+	ServerSideEncryptionAwsKmsDsse                      = "aws:kms:dsse"
+)
+
+// StorageClass specifies class to store newly created
+// objects, which has default value of STANDARD. For more information, see
+// [Storage Classes] in the Amazon S3 User Guide.
+type StorageClass string
+
+// Enum values for StorageClass
+const (
+	StorageClassStandard           StorageClass = "STANDARD"
+	StorageClassReducedRedundancy               = "REDUCED_REDUNDANCY"
+	StorageClassStandardIa                      = "STANDARD_IA"
+	StorageClassOnezoneIa                       = "ONEZONE_IA"
+	StorageClassIntelligentTiering              = "INTELLIGENT_TIERING"
+	StorageClassGlacier                         = "GLACIER"
+	StorageClassDeepArchive                     = "DEEP_ARCHIVE"
+	StorageClassOutposts                        = "OUTPOSTS"
+	StorageClassGlacierIr                       = "GLACIER_IR"
+	StorageClassSnow                            = "SNOW"
+	StorageClassExpressOnezone                  = "EXPRESS_ONEZONE"
+)
+
+// CompletedPart includes details of the parts that were uploaded.
+type CompletedPart struct {
+
+	// The base64-encoded, 32-bit CRC32 checksum of the object. This will only be
+	// present if it was uploaded with the object. When you use an API operation on an
+	// object that was uploaded using multipart uploads, this value may not be a direct
+	// checksum value of the full object. Instead, it's a calculation based on the
+	// checksum values of each individual part. For more information about how
+	// checksums are calculated with multipart uploads, see [Checking object integrity]in the Amazon S3 User
+	// Guide.
+	//
+	// [Checking object integrity]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums
+	ChecksumCRC32 *string
+
+	// The base64-encoded, 32-bit CRC32C checksum of the object. This will only be
+	// present if it was uploaded with the object. When you use an API operation on an
+	// object that was uploaded using multipart uploads, this value may not be a direct
+	// checksum value of the full object. Instead, it's a calculation based on the
+	// checksum values of each individual part. For more information about how
+	// checksums are calculated with multipart uploads, see [Checking object integrity]in the Amazon S3 User
+	// Guide.
+	//
+	// [Checking object integrity]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums
+	ChecksumCRC32C *string
+
+	// The base64-encoded, 160-bit SHA-1 digest of the object. This will only be
+	// present if it was uploaded with the object. When you use the API operation on an
+	// object that was uploaded using multipart uploads, this value may not be a direct
+	// checksum value of the full object. Instead, it's a calculation based on the
+	// checksum values of each individual part. For more information about how
+	// checksums are calculated with multipart uploads, see [Checking object integrity]in the Amazon S3 User
+	// Guide.
+	//
+	// [Checking object integrity]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums
+	ChecksumSHA1 *string
+
+	// The base64-encoded, 256-bit SHA-256 digest of the object. This will only be
+	// present if it was uploaded with the object. When you use an API operation on an
+	// object that was uploaded using multipart uploads, this value may not be a direct
+	// checksum value of the full object. Instead, it's a calculation based on the
+	// checksum values of each individual part. For more information about how
+	// checksums are calculated with multipart uploads, see [Checking object integrity]in the Amazon S3 User
+	// Guide.
+	//
+	// [Checking object integrity]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html#large-object-checksums
+	ChecksumSHA256 *string
+
+	// Entity tag returned when the part was uploaded.
+	ETag *string
+
+	// Part number that identifies the part. This is a positive integer between 1 and
+	// 10,000.
+	//
+	//   - General purpose buckets - In CompleteMultipartUpload , when a additional
+	//   checksum (including x-amz-checksum-crc32 , x-amz-checksum-crc32c ,
+	//   x-amz-checksum-sha1 , or x-amz-checksum-sha256 ) is applied to each part, the
+	//   PartNumber must start at 1 and the part numbers must be consecutive.
+	//   Otherwise, Amazon S3 generates an HTTP 400 Bad Request status code and an
+	//   InvalidPartOrder error code.
+	//
+	//   - Directory buckets - In CompleteMultipartUpload , the PartNumber must start
+	//   at 1 and the part numbers must be consecutive.
+	PartNumber *int32
+}
+
+// MapCompletedPart maps CompletedPart to s3 types
+func (cp CompletedPart) MapCompletedPart() types.CompletedPart {
+	return types.CompletedPart{
+		ChecksumCRC32:  cp.ChecksumCRC32,
+		ChecksumCRC32C: cp.ChecksumCRC32C,
+		ChecksumSHA1:   cp.ChecksumSHA1,
+		ChecksumSHA256: cp.ChecksumSHA256,
+		ETag:           cp.ETag,
+		PartNumber:     cp.PartNumber,
+	}
+}
+
+// MapFrom set CompletedPart fields from s3 UploadPartOutput
+func (cp *CompletedPart) MapFrom(resp *s3.UploadPartOutput, partNum *int32) {
+	cp.ChecksumCRC32 = resp.ChecksumCRC32
+	cp.ChecksumCRC32C = resp.ChecksumCRC32C
+	cp.ChecksumSHA1 = resp.ChecksumSHA1
+	cp.ChecksumSHA256 = resp.ChecksumSHA256
+	cp.ETag = resp.ETag
+	cp.PartNumber = partNum
+}
+
+// RequestCharged indicates that the requester was successfully charged for the request.
+type RequestCharged string
+
+// Enum values for RequestCharged
+const (
+	RequestChargedRequester RequestCharged = "requester"
+)
+
+// Metadata provides storing and reading metadata values. Keys may be any
+// comparable value type. Get and set will panic if key is not a comparable
+// value type.
+//
+// Metadata uses lazy initialization, and Set method must be called as an
+// addressable value, or pointer. Not doing so may cause key/value pair to not
+// be set.
+type Metadata struct {
+	values map[interface{}]interface{}
+}
diff --git a/go.mod b/go.mod
index 79f24a9b00f..1bac0787213 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,5 @@
 module github.com/aws/aws-sdk-go-v2
 
-require (
-	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
-)
+require github.com/aws/smithy-go v1.22.2
 
 go 1.21
diff --git a/go.sum b/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/internal/configsources/CHANGELOG.md b/internal/configsources/CHANGELOG.md
index 6b5f2b314b9..113b1da37ae 100644
--- a/internal/configsources/CHANGELOG.md
+++ b/internal/configsources/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.3.31 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.3.30 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/internal/configsources/configtesting/go.mod b/internal/configsources/configtesting/go.mod
index f80fc031b81..28563aa6be0 100644
--- a/internal/configsources/configtesting/go.mod
+++ b/internal/configsources/configtesting/go.mod
@@ -3,21 +3,21 @@ module github.com/aws/aws-sdk-go-v2/internal/configsources/configtesting
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 )
 
diff --git a/internal/configsources/go.mod b/internal/configsources/go.mod
index 3689b2ab92d..2bf1c5a0e02 100644
--- a/internal/configsources/go.mod
+++ b/internal/configsources/go.mod
@@ -2,7 +2,7 @@ module github.com/aws/aws-sdk-go-v2/internal/configsources
 
 go 1.21
 
-require github.com/aws/aws-sdk-go-v2 v1.35.0
+require github.com/aws/aws-sdk-go-v2 v1.36.0
 
 require github.com/aws/smithy-go v1.22.2 // indirect
 
diff --git a/internal/configsources/go_module_metadata.go b/internal/configsources/go_module_metadata.go
index 2217926e565..28c635d67f1 100644
--- a/internal/configsources/go_module_metadata.go
+++ b/internal/configsources/go_module_metadata.go
@@ -3,4 +3,4 @@
 package configsources
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.3.30"
+const goModuleVersion = "1.3.31"
diff --git a/internal/endpoints/v2/CHANGELOG.md b/internal/endpoints/v2/CHANGELOG.md
index c535879bbbe..1cab71d5054 100644
--- a/internal/endpoints/v2/CHANGELOG.md
+++ b/internal/endpoints/v2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.6.31 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v2.6.30 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/internal/endpoints/v2/go.mod b/internal/endpoints/v2/go.mod
index 1a8e58d232c..f630205c88f 100644
--- a/internal/endpoints/v2/go.mod
+++ b/internal/endpoints/v2/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/internal/endpoints/v2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/endpoints/v2/go_module_metadata.go b/internal/endpoints/v2/go_module_metadata.go
index 04f843d05ea..589a4a74d61 100644
--- a/internal/endpoints/v2/go_module_metadata.go
+++ b/internal/endpoints/v2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package endpoints
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "2.6.30"
+const goModuleVersion = "2.6.31"
diff --git a/internal/protocoltest/awsrestjson/go.mod b/internal/protocoltest/awsrestjson/go.mod
index 21bbb1eb082..756b56004ef 100644
--- a/internal/protocoltest/awsrestjson/go.mod
+++ b/internal/protocoltest/awsrestjson/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/awsrestjson
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/ec2query/go.mod b/internal/protocoltest/ec2query/go.mod
index f5a6497f034..5b3c9f1d127 100644
--- a/internal/protocoltest/ec2query/go.mod
+++ b/internal/protocoltest/ec2query/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/ec2query
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/jsonrpc/go.mod b/internal/protocoltest/jsonrpc/go.mod
index f95b4ffbbc7..2b6f6f1712f 100644
--- a/internal/protocoltest/jsonrpc/go.mod
+++ b/internal/protocoltest/jsonrpc/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/jsonrpc10/go.mod b/internal/protocoltest/jsonrpc10/go.mod
index 1a3fd1711a7..150a2b83ead 100644
--- a/internal/protocoltest/jsonrpc10/go.mod
+++ b/internal/protocoltest/jsonrpc10/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/jsonrpc10
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/query/go.mod b/internal/protocoltest/query/go.mod
index 6f25276cbf5..e3586bc76cd 100644
--- a/internal/protocoltest/query/go.mod
+++ b/internal/protocoltest/query/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/query
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/restxml/go.mod b/internal/protocoltest/restxml/go.mod
index e59b031370b..fd5d272aaf2 100644
--- a/internal/protocoltest/restxml/go.mod
+++ b/internal/protocoltest/restxml/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxml
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/restxmlwithnamespace/go.mod b/internal/protocoltest/restxmlwithnamespace/go.mod
index f39c5b2a3bd..26322d1129c 100644
--- a/internal/protocoltest/restxmlwithnamespace/go.mod
+++ b/internal/protocoltest/restxmlwithnamespace/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/restxmlwithnamespace
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/smithyrpcv2cbor/deserializers.go b/internal/protocoltest/smithyrpcv2cbor/deserializers.go
index ed5eac107d3..77c6bfdf534 100644
--- a/internal/protocoltest/smithyrpcv2cbor/deserializers.go
+++ b/internal/protocoltest/smithyrpcv2cbor/deserializers.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws/smithy-go/middleware"
 	"github.com/aws/smithy-go/ptr"
 	smithytime "github.com/aws/smithy-go/time"
+	"github.com/aws/smithy-go/tracing"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"io"
 	"io/ioutil"
@@ -36,6 +37,10 @@ func (*smithyRpcv2cbor_deserializeOpEmptyInputOutput) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpEmptyInputOutput) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -79,6 +84,10 @@ func (*smithyRpcv2cbor_deserializeOpFloat16) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpFloat16) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -138,6 +147,10 @@ func (*smithyRpcv2cbor_deserializeOpFractionalSeconds) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpFractionalSeconds) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -197,6 +210,10 @@ func (*smithyRpcv2cbor_deserializeOpGreetingWithErrors) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpGreetingWithErrors) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -256,6 +273,10 @@ func (*smithyRpcv2cbor_deserializeOpNoInputOutput) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpNoInputOutput) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -299,6 +320,10 @@ func (*smithyRpcv2cbor_deserializeOpOperationWithDefaults) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpOperationWithDefaults) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -358,6 +383,10 @@ func (*smithyRpcv2cbor_deserializeOpOptionalInputOutput) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpOptionalInputOutput) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -417,6 +446,10 @@ func (*smithyRpcv2cbor_deserializeOpRecursiveShapes) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpRecursiveShapes) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -476,6 +509,10 @@ func (*smithyRpcv2cbor_deserializeOpRpcV2CborDenseMaps) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpRpcV2CborDenseMaps) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -535,6 +572,10 @@ func (*smithyRpcv2cbor_deserializeOpRpcV2CborLists) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpRpcV2CborLists) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -594,6 +635,10 @@ func (*smithyRpcv2cbor_deserializeOpRpcV2CborSparseMaps) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpRpcV2CborSparseMaps) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -653,6 +698,10 @@ func (*smithyRpcv2cbor_deserializeOpSimpleScalarProperties) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpSimpleScalarProperties) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
@@ -712,6 +761,10 @@ func (*smithyRpcv2cbor_deserializeOpSparseNullsOperation) ID() string {
 func (m *smithyRpcv2cbor_deserializeOpSparseNullsOperation) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
 	out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationDeserializer")
+	endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+	defer endTimer()
+	defer span.End()
 	out, metadata, err = next.HandleDeserialize(ctx, in)
 	if err != nil {
 		return out, metadata, err
diff --git a/internal/protocoltest/smithyrpcv2cbor/go.mod b/internal/protocoltest/smithyrpcv2cbor/go.mod
index aeabd79ca0e..563a682d627 100644
--- a/internal/protocoltest/smithyrpcv2cbor/go.mod
+++ b/internal/protocoltest/smithyrpcv2cbor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/internal/protocoltest/smithyrpcv2cbor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/protocoltest/smithyrpcv2cbor/serializers.go b/internal/protocoltest/smithyrpcv2cbor/serializers.go
index 045e4ba39ca..945ff6297be 100644
--- a/internal/protocoltest/smithyrpcv2cbor/serializers.go
+++ b/internal/protocoltest/smithyrpcv2cbor/serializers.go
@@ -10,6 +10,7 @@ import (
 	smithy "github.com/aws/smithy-go"
 	smithycbor "github.com/aws/smithy-go/encoding/cbor"
 	"github.com/aws/smithy-go/middleware"
+	"github.com/aws/smithy-go/tracing"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"net/http"
 	"time"
@@ -25,6 +26,10 @@ func (*smithyRpcv2cbor_serializeOpEmptyInputOutput) ID() string {
 func (m *smithyRpcv2cbor_serializeOpEmptyInputOutput) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*EmptyInputOutputInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -68,6 +73,10 @@ func (*smithyRpcv2cbor_serializeOpFloat16) ID() string {
 func (m *smithyRpcv2cbor_serializeOpFloat16) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*Float16Input)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -98,6 +107,10 @@ func (*smithyRpcv2cbor_serializeOpFractionalSeconds) ID() string {
 func (m *smithyRpcv2cbor_serializeOpFractionalSeconds) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*FractionalSecondsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -128,6 +141,10 @@ func (*smithyRpcv2cbor_serializeOpGreetingWithErrors) ID() string {
 func (m *smithyRpcv2cbor_serializeOpGreetingWithErrors) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*GreetingWithErrorsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -158,6 +175,10 @@ func (*smithyRpcv2cbor_serializeOpNoInputOutput) ID() string {
 func (m *smithyRpcv2cbor_serializeOpNoInputOutput) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*NoInputOutputInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -188,6 +209,10 @@ func (*smithyRpcv2cbor_serializeOpOperationWithDefaults) ID() string {
 func (m *smithyRpcv2cbor_serializeOpOperationWithDefaults) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*OperationWithDefaultsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -231,6 +256,10 @@ func (*smithyRpcv2cbor_serializeOpOptionalInputOutput) ID() string {
 func (m *smithyRpcv2cbor_serializeOpOptionalInputOutput) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*OptionalInputOutputInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -274,6 +303,10 @@ func (*smithyRpcv2cbor_serializeOpRecursiveShapes) ID() string {
 func (m *smithyRpcv2cbor_serializeOpRecursiveShapes) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*RecursiveShapesInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -317,6 +350,10 @@ func (*smithyRpcv2cbor_serializeOpRpcV2CborDenseMaps) ID() string {
 func (m *smithyRpcv2cbor_serializeOpRpcV2CborDenseMaps) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*RpcV2CborDenseMapsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -360,6 +397,10 @@ func (*smithyRpcv2cbor_serializeOpRpcV2CborLists) ID() string {
 func (m *smithyRpcv2cbor_serializeOpRpcV2CborLists) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*RpcV2CborListsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -403,6 +444,10 @@ func (*smithyRpcv2cbor_serializeOpRpcV2CborSparseMaps) ID() string {
 func (m *smithyRpcv2cbor_serializeOpRpcV2CborSparseMaps) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*RpcV2CborSparseMapsInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -446,6 +491,10 @@ func (*smithyRpcv2cbor_serializeOpSimpleScalarProperties) ID() string {
 func (m *smithyRpcv2cbor_serializeOpSimpleScalarProperties) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*SimpleScalarPropertiesInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
@@ -489,6 +538,10 @@ func (*smithyRpcv2cbor_serializeOpSparseNullsOperation) ID() string {
 func (m *smithyRpcv2cbor_serializeOpSparseNullsOperation) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
 	out middleware.SerializeOutput, metadata middleware.Metadata, err error,
 ) {
+	_, span := tracing.StartSpan(ctx, "OperationSerializer")
+	endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
+	defer endTimer()
+	defer span.End()
 	input, ok := in.Parameters.(*SparseNullsOperationInput)
 	if !ok {
 		return out, metadata, fmt.Errorf("unexpected input type %T", in.Parameters)
diff --git a/internal/v4a/CHANGELOG.md b/internal/v4a/CHANGELOG.md
index 9ed9225fdc5..909d42e92c8 100644
--- a/internal/v4a/CHANGELOG.md
+++ b/internal/v4a/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.3.31 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.3.30 (2025-01-30)
 
 * **Bug Fix**: Do not sign Transfer-Encoding header in Sigv4[a]. Fixes a signer mismatch issue with S3 Accelerate.
diff --git a/internal/v4a/go.mod b/internal/v4a/go.mod
index 98389684190..141d157fec5 100644
--- a/internal/v4a/go.mod
+++ b/internal/v4a/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/internal/v4a
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/internal/v4a/go_module_metadata.go b/internal/v4a/go_module_metadata.go
index 0bd10d25493..6d988783beb 100644
--- a/internal/v4a/go_module_metadata.go
+++ b/internal/v4a/go_module_metadata.go
@@ -3,4 +3,4 @@
 package v4a
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.3.30"
+const goModuleVersion = "1.3.31"
diff --git a/jmespath.go b/jmespath.go
deleted file mode 100644
index 12a0e654e3c..00000000000
--- a/jmespath.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sdk
-
-import "github.com/jmespath/go-jmespath"
-
-// Temporarily pin go-jmespath as a direct dependency.
-// FUTURE: remove this once all waiters are code-generated.
-var _ = jmespath.Search
diff --git a/modman.toml b/modman.toml
index c642b50193b..f43e4f4da4e 100644
--- a/modman.toml
+++ b/modman.toml
@@ -2,7 +2,6 @@
 [dependencies]
   "github.com/aws/aws-sdk-go" = "v1.44.28"
   "github.com/aws/smithy-go" = "v1.22.2"
-  "github.com/jmespath/go-jmespath" = "v0.4.0"
 
 [modules]
 
@@ -27,6 +26,9 @@
   [modules."feature/ec2/imds/internal/configtesting"]
     no_tag = true
 
+  [modules."feature/s3/transfermanager"]
+    no_tag = true
+
   [modules."internal/codegen"]
     no_tag = true
 
diff --git a/service/accessanalyzer/CHANGELOG.md b/service/accessanalyzer/CHANGELOG.md
index 5cc88bd6293..8a3f80c91ed 100644
--- a/service/accessanalyzer/CHANGELOG.md
+++ b/service/accessanalyzer/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/accessanalyzer/go.mod b/service/accessanalyzer/go.mod
index 2337aeec6da..b17cd9bbc5e 100644
--- a/service/accessanalyzer/go.mod
+++ b/service/accessanalyzer/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/accessanalyzer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/accessanalyzer/go_module_metadata.go b/service/accessanalyzer/go_module_metadata.go
index 5ae881bea60..4ada1b0433a 100644
--- a/service/accessanalyzer/go_module_metadata.go
+++ b/service/accessanalyzer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package accessanalyzer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.10"
+const goModuleVersion = "1.36.11"
diff --git a/service/account/CHANGELOG.md b/service/account/CHANGELOG.md
index d8f6e1eb96e..a14d55fad9c 100644
--- a/service/account/CHANGELOG.md
+++ b/service/account/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/account/go.mod b/service/account/go.mod
index 13ee0f989c3..a12fe84dd4f 100644
--- a/service/account/go.mod
+++ b/service/account/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/account
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/account/go_module_metadata.go b/service/account/go_module_metadata.go
index fd433cb2aa6..a40f9a089bf 100644
--- a/service/account/go_module_metadata.go
+++ b/service/account/go_module_metadata.go
@@ -3,4 +3,4 @@
 package account
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.6"
+const goModuleVersion = "1.22.7"
diff --git a/service/acm/CHANGELOG.md b/service/acm/CHANGELOG.md
index 1d151252d55..321788d5693 100644
--- a/service/acm/CHANGELOG.md
+++ b/service/acm/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.30.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/acm/api_op_DescribeCertificate.go b/service/acm/api_op_DescribeCertificate.go
index 9806648189a..ea001a6b115 100644
--- a/service/acm/api_op_DescribeCertificate.go
+++ b/service/acm/api_op_DescribeCertificate.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -326,29 +325,23 @@ func (w *CertificateValidatedWaiter) WaitForOutput(ctx context.Context, params *
 func certificateValidatedStateRetryable(ctx context.Context, input *DescribeCertificateInput, output *DescribeCertificateOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Certificate.DomainValidationOptions[].ValidationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Certificate
+		var v2 []types.DomainValidation
+		if v1 != nil {
+			v3 := v1.DomainValidationOptions
+			v2 = v3
 		}
-
-		expectedValue := "SUCCESS"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
+		var v4 []types.DomainStatus
+		for _, v := range v2 {
+			v5 := v.ValidationStatus
+			v4 = append(v4, v5)
 		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.DomainStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.DomainStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		expectedValue := "SUCCESS"
+		match := len(v4) > 0
+		for _, v := range v4 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -358,42 +351,42 @@ func certificateValidatedStateRetryable(ctx context.Context, input *DescribeCert
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Certificate.DomainValidationOptions[].ValidationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Certificate
+		var v2 []types.DomainValidation
+		if v1 != nil {
+			v3 := v1.DomainValidationOptions
+			v2 = v3
 		}
-
-		expectedValue := "PENDING_VALIDATION"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
+		var v4 []types.DomainStatus
+		for _, v := range v2 {
+			v5 := v.ValidationStatus
+			v4 = append(v4, v5)
 		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.DomainStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.DomainStatus value, got %T", pathValue)
+		expectedValue := "PENDING_VALIDATION"
+		var match bool
+		for _, v := range v4 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return true, nil
-			}
+		if match {
+			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Certificate.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Certificate
+		var v2 types.CertificateStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.CertificateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CertificateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/acm/generated.json b/service/acm/generated.json
index ce8521d3418..dcb7bd59be8 100644
--- a/service/acm/generated.json
+++ b/service/acm/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/acm/go.mod b/service/acm/go.mod
index 63abd987d9d..b17c8cf557d 100644
--- a/service/acm/go.mod
+++ b/service/acm/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/acm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/acm/go.sum b/service/acm/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/acm/go.sum
+++ b/service/acm/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/acm/go_module_metadata.go b/service/acm/go_module_metadata.go
index 676a85a875d..44e336d2e17 100644
--- a/service/acm/go_module_metadata.go
+++ b/service/acm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package acm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.15"
+const goModuleVersion = "1.30.16"
diff --git a/service/acmpca/CHANGELOG.md b/service/acmpca/CHANGELOG.md
index f97805da860..f8e62e45067 100644
--- a/service/acmpca/CHANGELOG.md
+++ b/service/acmpca/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.37.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go
index 3d9947bc205..596d64ad246 100644
--- a/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go
+++ b/service/acmpca/api_op_DescribeCertificateAuthorityAuditReport.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -339,35 +338,21 @@ func (w *AuditReportCreatedWaiter) WaitForOutput(ctx context.Context, params *De
 func auditReportCreatedStateRetryable(ctx context.Context, input *DescribeCertificateAuthorityAuditReportInput, output *DescribeCertificateAuthorityAuditReportOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("AuditReportStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.AuditReportStatus
 		expectedValue := "SUCCESS"
-		value, ok := pathValue.(types.AuditReportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AuditReportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("AuditReportStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.AuditReportStatus
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.AuditReportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AuditReportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/acmpca/generated.json b/service/acmpca/generated.json
index 7b42457ad16..63664d28bdc 100644
--- a/service/acmpca/generated.json
+++ b/service/acmpca/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/acmpca/go.mod b/service/acmpca/go.mod
index 16b446d1f72..073e94a11f1 100644
--- a/service/acmpca/go.mod
+++ b/service/acmpca/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/acmpca
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/acmpca/go.sum b/service/acmpca/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/acmpca/go.sum
+++ b/service/acmpca/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/acmpca/go_module_metadata.go b/service/acmpca/go_module_metadata.go
index 21046a84436..9e5d142b76e 100644
--- a/service/acmpca/go_module_metadata.go
+++ b/service/acmpca/go_module_metadata.go
@@ -3,4 +3,4 @@
 package acmpca
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.15"
+const goModuleVersion = "1.37.16"
diff --git a/service/amp/CHANGELOG.md b/service/amp/CHANGELOG.md
index 71ff8dd546c..3ffbf417772 100644
--- a/service/amp/CHANGELOG.md
+++ b/service/amp/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.31.0 (2025-01-31)
+
+* **Feature**: Add support for sending metrics to cross account and CMCK AMP workspaces through RoleConfiguration on Create/Update Scraper.
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/amp/api_op_CreateScraper.go b/service/amp/api_op_CreateScraper.go
index 102d0945b2f..be0d3c32c74 100644
--- a/service/amp/api_op_CreateScraper.go
+++ b/service/amp/api_op_CreateScraper.go
@@ -76,6 +76,9 @@ type CreateScraperInput struct {
 	// the idempotency of the request.
 	ClientToken *string
 
+	// The scraper role configuration for the workspace.
+	RoleConfiguration *types.RoleConfiguration
+
 	// (Optional) The list of tag keys and values to associate with the scraper.
 	Tags map[string]string
 
diff --git a/service/amp/api_op_DescribeScraper.go b/service/amp/api_op_DescribeScraper.go
index 02550680dce..f36eea7edee 100644
--- a/service/amp/api_op_DescribeScraper.go
+++ b/service/amp/api_op_DescribeScraper.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -317,35 +316,41 @@ func (w *ScraperActiveWaiter) WaitForOutput(ctx context.Context, params *Describ
 func scraperActiveStateRetryable(ctx context.Context, input *DescribeScraperInput, output *DescribeScraperOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("scraper.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Scraper
+		var v2 *types.ScraperStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ScraperStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ScraperStatusCode value, got %T", pathValue)
+		var v4 types.ScraperStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "ACTIVE"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("scraper.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Scraper
+		var v2 *types.ScraperStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "CREATION_FAILED"
-		value, ok := pathValue.(types.ScraperStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ScraperStatusCode value, got %T", pathValue)
+		var v4 types.ScraperStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "CREATION_FAILED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -523,18 +528,21 @@ func scraperDeletedStateRetryable(ctx context.Context, input *DescribeScraperInp
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("scraper.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Scraper
+		var v2 *types.ScraperStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "DELETION_FAILED"
-		value, ok := pathValue.(types.ScraperStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ScraperStatusCode value, got %T", pathValue)
+		var v4 types.ScraperStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "DELETION_FAILED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/amp/api_op_DescribeWorkspace.go b/service/amp/api_op_DescribeWorkspace.go
index e750a37844a..3340a67c0c9 100644
--- a/service/amp/api_op_DescribeWorkspace.go
+++ b/service/amp/api_op_DescribeWorkspace.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -317,52 +316,61 @@ func (w *WorkspaceActiveWaiter) WaitForOutput(ctx context.Context, params *Descr
 func workspaceActiveStateRetryable(ctx context.Context, input *DescribeWorkspaceInput, output *DescribeWorkspaceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("workspace.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Workspace
+		var v2 *types.WorkspaceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.WorkspaceStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkspaceStatusCode value, got %T", pathValue)
+		var v4 types.WorkspaceStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "ACTIVE"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("workspace.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Workspace
+		var v2 *types.WorkspaceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.WorkspaceStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkspaceStatusCode value, got %T", pathValue)
+		var v4 types.WorkspaceStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "UPDATING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("workspace.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Workspace
+		var v2 *types.WorkspaceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "CREATING"
-		value, ok := pathValue.(types.WorkspaceStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkspaceStatusCode value, got %T", pathValue)
+		var v4 types.WorkspaceStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "CREATING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -540,18 +548,21 @@ func workspaceDeletedStateRetryable(ctx context.Context, input *DescribeWorkspac
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("workspace.status.statusCode", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Workspace
+		var v2 *types.WorkspaceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "DELETING"
-		value, ok := pathValue.(types.WorkspaceStatusCode)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkspaceStatusCode value, got %T", pathValue)
+		var v4 types.WorkspaceStatusCode
+		if v2 != nil {
+			v5 := v2.StatusCode
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "DELETING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/amp/api_op_UpdateScraper.go b/service/amp/api_op_UpdateScraper.go
index afc7bfce213..644ba042903 100644
--- a/service/amp/api_op_UpdateScraper.go
+++ b/service/amp/api_op_UpdateScraper.go
@@ -48,6 +48,9 @@ type UpdateScraperInput struct {
 	// The new Amazon Managed Service for Prometheus workspace to send metrics to.
 	Destination types.Destination
 
+	// The scraper role configuration for the workspace.
+	RoleConfiguration *types.RoleConfiguration
+
 	// Contains the base-64 encoded YAML configuration for the scraper.
 	//
 	// For more information about configuring a scraper, see [Using an Amazon Web Services managed collector] in the Amazon Managed
diff --git a/service/amp/deserializers.go b/service/amp/deserializers.go
index 896cfbf1b59..287f76915df 100644
--- a/service/amp/deserializers.go
+++ b/service/amp/deserializers.go
@@ -5145,6 +5145,55 @@ func awsRestjson1_deserializeDocumentResourceNotFoundException(v **types.Resourc
 	return nil
 }
 
+func awsRestjson1_deserializeDocumentRoleConfiguration(v **types.RoleConfiguration, value interface{}) error {
+	if v == nil {
+		return fmt.Errorf("unexpected nil of type %T", v)
+	}
+	if value == nil {
+		return nil
+	}
+
+	shape, ok := value.(map[string]interface{})
+	if !ok {
+		return fmt.Errorf("unexpected JSON type %v", value)
+	}
+
+	var sv *types.RoleConfiguration
+	if *v == nil {
+		sv = &types.RoleConfiguration{}
+	} else {
+		sv = *v
+	}
+
+	for key, value := range shape {
+		switch key {
+		case "sourceRoleArn":
+			if value != nil {
+				jtv, ok := value.(string)
+				if !ok {
+					return fmt.Errorf("expected IamRoleArn to be of type string, got %T instead", value)
+				}
+				sv.SourceRoleArn = ptr.String(jtv)
+			}
+
+		case "targetRoleArn":
+			if value != nil {
+				jtv, ok := value.(string)
+				if !ok {
+					return fmt.Errorf("expected IamRoleArn to be of type string, got %T instead", value)
+				}
+				sv.TargetRoleArn = ptr.String(jtv)
+			}
+
+		default:
+			_, _ = key, value
+
+		}
+	}
+	*v = sv
+	return nil
+}
+
 func awsRestjson1_deserializeDocumentRuleGroupsNamespaceDescription(v **types.RuleGroupsNamespaceDescription, value interface{}) error {
 	if v == nil {
 		return fmt.Errorf("unexpected nil of type %T", v)
@@ -5555,6 +5604,11 @@ func awsRestjson1_deserializeDocumentScraperDescription(v **types.ScraperDescrip
 				sv.RoleArn = ptr.String(jtv)
 			}
 
+		case "roleConfiguration":
+			if err := awsRestjson1_deserializeDocumentRoleConfiguration(&sv.RoleConfiguration, value); err != nil {
+				return err
+			}
+
 		case "scrapeConfiguration":
 			if err := awsRestjson1_deserializeDocumentScrapeConfiguration(&sv.ScrapeConfiguration, value); err != nil {
 				return err
@@ -5728,6 +5782,11 @@ func awsRestjson1_deserializeDocumentScraperSummary(v **types.ScraperSummary, va
 				sv.RoleArn = ptr.String(jtv)
 			}
 
+		case "roleConfiguration":
+			if err := awsRestjson1_deserializeDocumentRoleConfiguration(&sv.RoleConfiguration, value); err != nil {
+				return err
+			}
+
 		case "scraperId":
 			if value != nil {
 				jtv, ok := value.(string)
diff --git a/service/amp/generated.json b/service/amp/generated.json
index 7fee59d2afd..cd32690a4d0 100644
--- a/service/amp/generated.json
+++ b/service/amp/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/amp/go.mod b/service/amp/go.mod
index 3129a6f278c..7670151b24b 100644
--- a/service/amp/go.mod
+++ b/service/amp/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/amp
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/amp/go.sum b/service/amp/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/amp/go.sum
+++ b/service/amp/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/amp/go_module_metadata.go b/service/amp/go_module_metadata.go
index eaaa40fb4b2..a211b986504 100644
--- a/service/amp/go_module_metadata.go
+++ b/service/amp/go_module_metadata.go
@@ -3,4 +3,4 @@
 package amp
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.11"
+const goModuleVersion = "1.31.0"
diff --git a/service/amp/serializers.go b/service/amp/serializers.go
index 28582acac2d..0e7412addd4 100644
--- a/service/amp/serializers.go
+++ b/service/amp/serializers.go
@@ -414,6 +414,13 @@ func awsRestjson1_serializeOpDocumentCreateScraperInput(v *CreateScraperInput, v
 		}
 	}
 
+	if v.RoleConfiguration != nil {
+		ok := object.Key("roleConfiguration")
+		if err := awsRestjson1_serializeDocumentRoleConfiguration(v.RoleConfiguration, ok); err != nil {
+			return err
+		}
+	}
+
 	if v.ScrapeConfiguration != nil {
 		ok := object.Key("scrapeConfiguration")
 		if err := awsRestjson1_serializeDocumentScrapeConfiguration(v.ScrapeConfiguration, ok); err != nil {
@@ -2233,6 +2240,13 @@ func awsRestjson1_serializeOpDocumentUpdateScraperInput(v *UpdateScraperInput, v
 		}
 	}
 
+	if v.RoleConfiguration != nil {
+		ok := object.Key("roleConfiguration")
+		if err := awsRestjson1_serializeDocumentRoleConfiguration(v.RoleConfiguration, ok); err != nil {
+			return err
+		}
+	}
+
 	if v.ScrapeConfiguration != nil {
 		ok := object.Key("scrapeConfiguration")
 		if err := awsRestjson1_serializeDocumentScrapeConfiguration(v.ScrapeConfiguration, ok); err != nil {
@@ -2398,6 +2412,23 @@ func awsRestjson1_serializeDocumentEksConfiguration(v *types.EksConfiguration, v
 	return nil
 }
 
+func awsRestjson1_serializeDocumentRoleConfiguration(v *types.RoleConfiguration, value smithyjson.Value) error {
+	object := value.Object()
+	defer object.Close()
+
+	if v.SourceRoleArn != nil {
+		ok := object.Key("sourceRoleArn")
+		ok.String(*v.SourceRoleArn)
+	}
+
+	if v.TargetRoleArn != nil {
+		ok := object.Key("targetRoleArn")
+		ok.String(*v.TargetRoleArn)
+	}
+
+	return nil
+}
+
 func awsRestjson1_serializeDocumentScrapeConfiguration(v types.ScrapeConfiguration, value smithyjson.Value) error {
 	object := value.Object()
 	defer object.Close()
diff --git a/service/amp/types/types.go b/service/amp/types/types.go
index 2da4a400f3d..e46ad12a795 100644
--- a/service/amp/types/types.go
+++ b/service/amp/types/types.go
@@ -148,6 +148,19 @@ type LoggingConfigurationStatus struct {
 	noSmithyDocumentSerde
 }
 
+// To configure roles that allows users to write to an Amazon Managed Service for
+// Prometheus workspace in a different account.
+type RoleConfiguration struct {
+
+	// A ARN identifying the source role configuration.
+	SourceRoleArn *string
+
+	// A ARN identifying the target role configuration.
+	TargetRoleArn *string
+
+	noSmithyDocumentSerde
+}
+
 // The details about one rule groups namespace.
 type RuleGroupsNamespaceDescription struct {
 
@@ -324,6 +337,10 @@ type ScraperDescription struct {
 	// (Optional) A name associated with the scraper.
 	Alias *string
 
+	// To configure roles that allows users to write to an Amazon Managed Service for
+	// Prometheus workspace in a different account.
+	RoleConfiguration *RoleConfiguration
+
 	// If there is a failure, the reason for the failure.
 	StatusReason *string
 
@@ -393,6 +410,10 @@ type ScraperSummary struct {
 	// (Optional) A name associated with the scraper.
 	Alias *string
 
+	// To configure roles that allows users to write to an Amazon Managed Service for
+	// Prometheus workspace in a different account.
+	RoleConfiguration *RoleConfiguration
+
 	// If there is a failure, the reason for the failure.
 	StatusReason *string
 
diff --git a/service/amplify/CHANGELOG.md b/service/amplify/CHANGELOG.md
index f5d8b8ca6b1..ad2e0e8d8f5 100644
--- a/service/amplify/CHANGELOG.md
+++ b/service/amplify/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/amplify/go.mod b/service/amplify/go.mod
index 5af40b8134f..560f3aa5b57 100644
--- a/service/amplify/go.mod
+++ b/service/amplify/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/amplify
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/amplify/go_module_metadata.go b/service/amplify/go_module_metadata.go
index 07a69f3d1da..3ef03e3ba89 100644
--- a/service/amplify/go_module_metadata.go
+++ b/service/amplify/go_module_metadata.go
@@ -3,4 +3,4 @@
 package amplify
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.6"
+const goModuleVersion = "1.28.7"
diff --git a/service/amplifybackend/CHANGELOG.md b/service/amplifybackend/CHANGELOG.md
index 132def2a83c..8fb6a1bac2e 100644
--- a/service/amplifybackend/CHANGELOG.md
+++ b/service/amplifybackend/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/amplifybackend/go.mod b/service/amplifybackend/go.mod
index 13eeeb0e7d7..4d1d002c574 100644
--- a/service/amplifybackend/go.mod
+++ b/service/amplifybackend/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/amplifybackend
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/amplifybackend/go_module_metadata.go b/service/amplifybackend/go_module_metadata.go
index 05c2206086a..aee673d7481 100644
--- a/service/amplifybackend/go_module_metadata.go
+++ b/service/amplifybackend/go_module_metadata.go
@@ -3,4 +3,4 @@
 package amplifybackend
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/amplifyuibuilder/CHANGELOG.md b/service/amplifyuibuilder/CHANGELOG.md
index 2d648f74ab4..8e39aa49c59 100644
--- a/service/amplifyuibuilder/CHANGELOG.md
+++ b/service/amplifyuibuilder/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/amplifyuibuilder/go.mod b/service/amplifyuibuilder/go.mod
index d20a521b452..c7dc11c3279 100644
--- a/service/amplifyuibuilder/go.mod
+++ b/service/amplifyuibuilder/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/amplifyuibuilder
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/amplifyuibuilder/go_module_metadata.go b/service/amplifyuibuilder/go_module_metadata.go
index 4476eba22d1..e1bd8fe083b 100644
--- a/service/amplifyuibuilder/go_module_metadata.go
+++ b/service/amplifyuibuilder/go_module_metadata.go
@@ -3,4 +3,4 @@
 package amplifyuibuilder
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/apigateway/CHANGELOG.md b/service/apigateway/CHANGELOG.md
index e77b6f28317..d56975b2fbd 100644
--- a/service/apigateway/CHANGELOG.md
+++ b/service/apigateway/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/apigateway/go.mod b/service/apigateway/go.mod
index 6ad23cc4f5e..8aa6a832ecb 100644
--- a/service/apigateway/go.mod
+++ b/service/apigateway/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/apigateway
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/apigateway/go_module_metadata.go b/service/apigateway/go_module_metadata.go
index 62a02a9911b..28c73021869 100644
--- a/service/apigateway/go_module_metadata.go
+++ b/service/apigateway/go_module_metadata.go
@@ -3,4 +3,4 @@
 package apigateway
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.9"
+const goModuleVersion = "1.28.10"
diff --git a/service/apigatewaymanagementapi/CHANGELOG.md b/service/apigatewaymanagementapi/CHANGELOG.md
index a66b879af8c..87624f35381 100644
--- a/service/apigatewaymanagementapi/CHANGELOG.md
+++ b/service/apigatewaymanagementapi/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/apigatewaymanagementapi/go.mod b/service/apigatewaymanagementapi/go.mod
index 48838cd80dd..d07672fe17b 100644
--- a/service/apigatewaymanagementapi/go.mod
+++ b/service/apigatewaymanagementapi/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/apigatewaymanagementapi
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/apigatewaymanagementapi/go_module_metadata.go b/service/apigatewaymanagementapi/go_module_metadata.go
index 03b82f4dca2..5d2456b7ef9 100644
--- a/service/apigatewaymanagementapi/go_module_metadata.go
+++ b/service/apigatewaymanagementapi/go_module_metadata.go
@@ -3,4 +3,4 @@
 package apigatewaymanagementapi
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/apigatewayv2/CHANGELOG.md b/service/apigatewayv2/CHANGELOG.md
index b72b64ab0eb..351f7dd3ded 100644
--- a/service/apigatewayv2/CHANGELOG.md
+++ b/service/apigatewayv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/apigatewayv2/go.mod b/service/apigatewayv2/go.mod
index 6a672e57de5..c06d1ec3abd 100644
--- a/service/apigatewayv2/go.mod
+++ b/service/apigatewayv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/apigatewayv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/apigatewayv2/go_module_metadata.go b/service/apigatewayv2/go_module_metadata.go
index 8df7b174195..c795fd8bfbe 100644
--- a/service/apigatewayv2/go_module_metadata.go
+++ b/service/apigatewayv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package apigatewayv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.15"
+const goModuleVersion = "1.24.16"
diff --git a/service/appconfig/CHANGELOG.md b/service/appconfig/CHANGELOG.md
index 976b32b5c16..9ef21a2a215 100644
--- a/service/appconfig/CHANGELOG.md
+++ b/service/appconfig/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appconfig/go.mod b/service/appconfig/go.mod
index 4330e22e60b..15791f118d0 100644
--- a/service/appconfig/go.mod
+++ b/service/appconfig/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appconfig
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appconfig/go_module_metadata.go b/service/appconfig/go_module_metadata.go
index 76ac372bed5..082b5d09c85 100644
--- a/service/appconfig/go_module_metadata.go
+++ b/service/appconfig/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appconfig
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.9"
+const goModuleVersion = "1.36.10"
diff --git a/service/appconfigdata/CHANGELOG.md b/service/appconfigdata/CHANGELOG.md
index 37043253000..6238ebe6a77 100644
--- a/service/appconfigdata/CHANGELOG.md
+++ b/service/appconfigdata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.18.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.18.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appconfigdata/go.mod b/service/appconfigdata/go.mod
index 8b06cb8d23c..0ce6eea56b4 100644
--- a/service/appconfigdata/go.mod
+++ b/service/appconfigdata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appconfigdata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appconfigdata/go_module_metadata.go b/service/appconfigdata/go_module_metadata.go
index bb5db8f61ed..f5935a054d9 100644
--- a/service/appconfigdata/go_module_metadata.go
+++ b/service/appconfigdata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appconfigdata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.18.15"
+const goModuleVersion = "1.18.16"
diff --git a/service/appfabric/CHANGELOG.md b/service/appfabric/CHANGELOG.md
index e9440939f7e..b42ecbdd9d3 100644
--- a/service/appfabric/CHANGELOG.md
+++ b/service/appfabric/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appfabric/go.mod b/service/appfabric/go.mod
index 4e4b8852ca5..8736e416153 100644
--- a/service/appfabric/go.mod
+++ b/service/appfabric/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appfabric
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appfabric/go_module_metadata.go b/service/appfabric/go_module_metadata.go
index a716c9651b0..caba8f2f492 100644
--- a/service/appfabric/go_module_metadata.go
+++ b/service/appfabric/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appfabric
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.13"
+const goModuleVersion = "1.11.14"
diff --git a/service/appflow/CHANGELOG.md b/service/appflow/CHANGELOG.md
index a18485482fa..fe637eb3f47 100644
--- a/service/appflow/CHANGELOG.md
+++ b/service/appflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appflow/go.mod b/service/appflow/go.mod
index e0e2234cd52..cd143780d2d 100644
--- a/service/appflow/go.mod
+++ b/service/appflow/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appflow
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appflow/go_module_metadata.go b/service/appflow/go_module_metadata.go
index 9a1413a5d0c..8c769bd544b 100644
--- a/service/appflow/go_module_metadata.go
+++ b/service/appflow/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appflow
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.14"
+const goModuleVersion = "1.45.15"
diff --git a/service/appintegrations/CHANGELOG.md b/service/appintegrations/CHANGELOG.md
index d11e74fc1ef..224efa04177 100644
--- a/service/appintegrations/CHANGELOG.md
+++ b/service/appintegrations/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appintegrations/go.mod b/service/appintegrations/go.mod
index 0f06a35d1c5..a8944130ccf 100644
--- a/service/appintegrations/go.mod
+++ b/service/appintegrations/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appintegrations
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appintegrations/go_module_metadata.go b/service/appintegrations/go_module_metadata.go
index b28bba11f18..b52ef2db399 100644
--- a/service/appintegrations/go_module_metadata.go
+++ b/service/appintegrations/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appintegrations
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.13"
+const goModuleVersion = "1.30.14"
diff --git a/service/applicationautoscaling/CHANGELOG.md b/service/applicationautoscaling/CHANGELOG.md
index 4b8b2becab9..b36a69dec2e 100644
--- a/service/applicationautoscaling/CHANGELOG.md
+++ b/service/applicationautoscaling/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/applicationautoscaling/go.mod b/service/applicationautoscaling/go.mod
index eff2eba1b0c..bbca115d5f5 100644
--- a/service/applicationautoscaling/go.mod
+++ b/service/applicationautoscaling/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/applicationautoscaling/go_module_metadata.go b/service/applicationautoscaling/go_module_metadata.go
index 7f6b452ea70..a07da5fc224 100644
--- a/service/applicationautoscaling/go_module_metadata.go
+++ b/service/applicationautoscaling/go_module_metadata.go
@@ -3,4 +3,4 @@
 package applicationautoscaling
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.10"
+const goModuleVersion = "1.34.11"
diff --git a/service/applicationcostprofiler/CHANGELOG.md b/service/applicationcostprofiler/CHANGELOG.md
index 76ecf1a9f9c..d38c2df2591 100644
--- a/service/applicationcostprofiler/CHANGELOG.md
+++ b/service/applicationcostprofiler/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/applicationcostprofiler/go.mod b/service/applicationcostprofiler/go.mod
index cc381d2ece7..e50742edf28 100644
--- a/service/applicationcostprofiler/go.mod
+++ b/service/applicationcostprofiler/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/applicationcostprofiler
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/applicationcostprofiler/go_module_metadata.go b/service/applicationcostprofiler/go_module_metadata.go
index 1b34745b01b..0ba44af577e 100644
--- a/service/applicationcostprofiler/go_module_metadata.go
+++ b/service/applicationcostprofiler/go_module_metadata.go
@@ -3,4 +3,4 @@
 package applicationcostprofiler
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.13"
+const goModuleVersion = "1.21.14"
diff --git a/service/applicationdiscoveryservice/CHANGELOG.md b/service/applicationdiscoveryservice/CHANGELOG.md
index 282ef1cb9c2..490418d6061 100644
--- a/service/applicationdiscoveryservice/CHANGELOG.md
+++ b/service/applicationdiscoveryservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/applicationdiscoveryservice/go.mod b/service/applicationdiscoveryservice/go.mod
index 3903a9fc648..6952b5bfe5f 100644
--- a/service/applicationdiscoveryservice/go.mod
+++ b/service/applicationdiscoveryservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/applicationdiscoveryservice/go_module_metadata.go b/service/applicationdiscoveryservice/go_module_metadata.go
index 0dc6fb78e84..a913c93214d 100644
--- a/service/applicationdiscoveryservice/go_module_metadata.go
+++ b/service/applicationdiscoveryservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package applicationdiscoveryservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.7"
+const goModuleVersion = "1.29.8"
diff --git a/service/applicationinsights/CHANGELOG.md b/service/applicationinsights/CHANGELOG.md
index 2a236dc0cfe..3525d96d1e6 100644
--- a/service/applicationinsights/CHANGELOG.md
+++ b/service/applicationinsights/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/applicationinsights/go.mod b/service/applicationinsights/go.mod
index c4aaf04ef3f..9a6dd16d863 100644
--- a/service/applicationinsights/go.mod
+++ b/service/applicationinsights/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/applicationinsights
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/applicationinsights/go_module_metadata.go b/service/applicationinsights/go_module_metadata.go
index 026b8d4b442..37b32c826b5 100644
--- a/service/applicationinsights/go_module_metadata.go
+++ b/service/applicationinsights/go_module_metadata.go
@@ -3,4 +3,4 @@
 package applicationinsights
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.11"
+const goModuleVersion = "1.29.12"
diff --git a/service/applicationsignals/CHANGELOG.md b/service/applicationsignals/CHANGELOG.md
index 34c5b977a5a..4a3c6001692 100644
--- a/service/applicationsignals/CHANGELOG.md
+++ b/service/applicationsignals/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/applicationsignals/go.mod b/service/applicationsignals/go.mod
index 63505fb8cbf..3777ef97e52 100644
--- a/service/applicationsignals/go.mod
+++ b/service/applicationsignals/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/applicationsignals
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/applicationsignals/go_module_metadata.go b/service/applicationsignals/go_module_metadata.go
index 41e89112023..4620b21df21 100644
--- a/service/applicationsignals/go_module_metadata.go
+++ b/service/applicationsignals/go_module_metadata.go
@@ -3,4 +3,4 @@
 package applicationsignals
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.8"
+const goModuleVersion = "1.7.9"
diff --git a/service/appmesh/CHANGELOG.md b/service/appmesh/CHANGELOG.md
index 7f90905e396..fbf692e5405 100644
--- a/service/appmesh/CHANGELOG.md
+++ b/service/appmesh/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appmesh/go.mod b/service/appmesh/go.mod
index b981edfac40..a7f1b3b9779 100644
--- a/service/appmesh/go.mod
+++ b/service/appmesh/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appmesh
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appmesh/go_module_metadata.go b/service/appmesh/go_module_metadata.go
index 033143d4055..67b8ffe2b53 100644
--- a/service/appmesh/go_module_metadata.go
+++ b/service/appmesh/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appmesh
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/apprunner/CHANGELOG.md b/service/apprunner/CHANGELOG.md
index c7ed326e7e8..feaeaf5566e 100644
--- a/service/apprunner/CHANGELOG.md
+++ b/service/apprunner/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/apprunner/go.mod b/service/apprunner/go.mod
index d063ae48dd1..81a3ed05acf 100644
--- a/service/apprunner/go.mod
+++ b/service/apprunner/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/apprunner
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/apprunner/go_module_metadata.go b/service/apprunner/go_module_metadata.go
index 484af2a77af..7b8ce283189 100644
--- a/service/apprunner/go_module_metadata.go
+++ b/service/apprunner/go_module_metadata.go
@@ -3,4 +3,4 @@
 package apprunner
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.13"
+const goModuleVersion = "1.32.14"
diff --git a/service/appstream/CHANGELOG.md b/service/appstream/CHANGELOG.md
index 2ae78cd5d32..ff26b7a96dd 100644
--- a/service/appstream/CHANGELOG.md
+++ b/service/appstream/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.43.1 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.43.0 (2025-01-30)
 
 * **Feature**: Add support for managing admin consent requirement on selected domains for OneDrive Storage Connectors in AppStream2.0.
diff --git a/service/appstream/api_op_DescribeFleets.go b/service/appstream/api_op_DescribeFleets.go
index 2b4ebc97a85..9c9cbdb9ee3 100644
--- a/service/appstream/api_op_DescribeFleets.go
+++ b/service/appstream/api_op_DescribeFleets.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -315,29 +314,18 @@ func (w *FleetStartedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func fleetStartedStateRetryable(ctx context.Context, input *DescribeFleetsInput, output *DescribeFleetsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "RUNNING"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -347,50 +335,44 @@ func fleetStartedStateRetryable(ctx context.Context, input *DescribeFleetsInput,
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "STOPPING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "STOPPED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -559,29 +541,18 @@ func (w *FleetStoppedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func fleetStoppedStateRetryable(ctx context.Context, input *DescribeFleetsInput, output *DescribeFleetsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "STOPPED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -591,50 +562,44 @@ func fleetStoppedStateRetryable(ctx context.Context, input *DescribeFleetsInput,
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "STARTING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Fleets[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Fleets
+		var v2 []types.FleetState
+		for _, v := range v1 {
+			v3 := v.State
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "RUNNING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.FleetState)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.FleetState value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/appstream/generated.json b/service/appstream/generated.json
index b6633551a5b..3d65a632337 100644
--- a/service/appstream/generated.json
+++ b/service/appstream/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/appstream/go.mod b/service/appstream/go.mod
index cb9b3345b23..502059f812b 100644
--- a/service/appstream/go.mod
+++ b/service/appstream/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/appstream
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/appstream/go.sum b/service/appstream/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/appstream/go.sum
+++ b/service/appstream/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/appstream/go_module_metadata.go b/service/appstream/go_module_metadata.go
index 6dedfc96a6e..ccfd65463ff 100644
--- a/service/appstream/go_module_metadata.go
+++ b/service/appstream/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appstream
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.43.0"
+const goModuleVersion = "1.43.1"
diff --git a/service/appsync/CHANGELOG.md b/service/appsync/CHANGELOG.md
index 1d11a769f5f..62e359fe88a 100644
--- a/service/appsync/CHANGELOG.md
+++ b/service/appsync/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.42.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.42.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/appsync/go.mod b/service/appsync/go.mod
index 58d07321bd2..ca434dfb809 100644
--- a/service/appsync/go.mod
+++ b/service/appsync/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/appsync
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/appsync/go_module_metadata.go b/service/appsync/go_module_metadata.go
index 083b4a4d76b..093ec7c0ff7 100644
--- a/service/appsync/go_module_metadata.go
+++ b/service/appsync/go_module_metadata.go
@@ -3,4 +3,4 @@
 package appsync
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.42.1"
+const goModuleVersion = "1.42.2"
diff --git a/service/apptest/CHANGELOG.md b/service/apptest/CHANGELOG.md
index 2faf8256e91..66ffadd3f03 100644
--- a/service/apptest/CHANGELOG.md
+++ b/service/apptest/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.4.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.4.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/apptest/go.mod b/service/apptest/go.mod
index 9f2ca192439..cc8e8eec33f 100644
--- a/service/apptest/go.mod
+++ b/service/apptest/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/apptest
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/apptest/go_module_metadata.go b/service/apptest/go_module_metadata.go
index 584859c9e55..7828537117c 100644
--- a/service/apptest/go_module_metadata.go
+++ b/service/apptest/go_module_metadata.go
@@ -3,4 +3,4 @@
 package apptest
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.4.13"
+const goModuleVersion = "1.4.14"
diff --git a/service/arczonalshift/CHANGELOG.md b/service/arczonalshift/CHANGELOG.md
index 139613cd280..5827add1e2a 100644
--- a/service/arczonalshift/CHANGELOG.md
+++ b/service/arczonalshift/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/arczonalshift/go.mod b/service/arczonalshift/go.mod
index 408a7bc7a61..63eb84ee373 100644
--- a/service/arczonalshift/go.mod
+++ b/service/arczonalshift/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/arczonalshift
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/arczonalshift/go_module_metadata.go b/service/arczonalshift/go_module_metadata.go
index 27fd2e6424e..3a0cc767dd4 100644
--- a/service/arczonalshift/go_module_metadata.go
+++ b/service/arczonalshift/go_module_metadata.go
@@ -3,4 +3,4 @@
 package arczonalshift
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.15"
+const goModuleVersion = "1.14.16"
diff --git a/service/artifact/CHANGELOG.md b/service/artifact/CHANGELOG.md
index 2c6a9b8d055..5ee60eed03e 100644
--- a/service/artifact/CHANGELOG.md
+++ b/service/artifact/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/artifact/go.mod b/service/artifact/go.mod
index e3ac12cbf36..2b67eb2a3b3 100644
--- a/service/artifact/go.mod
+++ b/service/artifact/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/artifact
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/artifact/go_module_metadata.go b/service/artifact/go_module_metadata.go
index a4c8e8c3f0e..3cbc463aa13 100644
--- a/service/artifact/go_module_metadata.go
+++ b/service/artifact/go_module_metadata.go
@@ -3,4 +3,4 @@
 package artifact
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.4"
+const goModuleVersion = "1.8.5"
diff --git a/service/athena/CHANGELOG.md b/service/athena/CHANGELOG.md
index 635ebb2c255..c28f7709a2f 100644
--- a/service/athena/CHANGELOG.md
+++ b/service/athena/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.49.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.49.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/athena/go.mod b/service/athena/go.mod
index 30846f9c205..ac9ba0dcce1 100644
--- a/service/athena/go.mod
+++ b/service/athena/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/athena
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/athena/go_module_metadata.go b/service/athena/go_module_metadata.go
index 3dd4ce639fa..e62f4782287 100644
--- a/service/athena/go_module_metadata.go
+++ b/service/athena/go_module_metadata.go
@@ -3,4 +3,4 @@
 package athena
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.49.7"
+const goModuleVersion = "1.49.8"
diff --git a/service/auditmanager/CHANGELOG.md b/service/auditmanager/CHANGELOG.md
index 53ab031deed..c4cb724776d 100644
--- a/service/auditmanager/CHANGELOG.md
+++ b/service/auditmanager/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.37.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/auditmanager/go.mod b/service/auditmanager/go.mod
index 81b52f52ecc..ef8da71c8ea 100644
--- a/service/auditmanager/go.mod
+++ b/service/auditmanager/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/auditmanager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/auditmanager/go_module_metadata.go b/service/auditmanager/go_module_metadata.go
index 300cc3ac98b..b1a87fbd9df 100644
--- a/service/auditmanager/go_module_metadata.go
+++ b/service/auditmanager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package auditmanager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.13"
+const goModuleVersion = "1.37.14"
diff --git a/service/autoscaling/CHANGELOG.md b/service/autoscaling/CHANGELOG.md
index f1b2380bf55..8d1ddb47c67 100644
--- a/service/autoscaling/CHANGELOG.md
+++ b/service/autoscaling/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.51.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.51.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/autoscaling/go.mod b/service/autoscaling/go.mod
index 1dc450962a9..a95016b0ae7 100644
--- a/service/autoscaling/go.mod
+++ b/service/autoscaling/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/autoscaling
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/autoscaling/go_module_metadata.go b/service/autoscaling/go_module_metadata.go
index efcec6e7701..c986c2850a2 100644
--- a/service/autoscaling/go_module_metadata.go
+++ b/service/autoscaling/go_module_metadata.go
@@ -3,4 +3,4 @@
 package autoscaling
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.51.9"
+const goModuleVersion = "1.51.10"
diff --git a/service/autoscalingplans/CHANGELOG.md b/service/autoscalingplans/CHANGELOG.md
index c4f4faaddf8..4b4e10d0d65 100644
--- a/service/autoscalingplans/CHANGELOG.md
+++ b/service/autoscalingplans/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/autoscalingplans/go.mod b/service/autoscalingplans/go.mod
index bb5d366e12f..cf2056480fe 100644
--- a/service/autoscalingplans/go.mod
+++ b/service/autoscalingplans/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/autoscalingplans
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/autoscalingplans/go_module_metadata.go b/service/autoscalingplans/go_module_metadata.go
index c120ba5dd48..1040817ff73 100644
--- a/service/autoscalingplans/go_module_metadata.go
+++ b/service/autoscalingplans/go_module_metadata.go
@@ -3,4 +3,4 @@
 package autoscalingplans
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/b2bi/CHANGELOG.md b/service/b2bi/CHANGELOG.md
index 2f8026dc7cf..c813c6ae7e1 100644
--- a/service/b2bi/CHANGELOG.md
+++ b/service/b2bi/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.0-preview.62 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.0-preview.61 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/b2bi/go.mod b/service/b2bi/go.mod
index 6c5956c7d61..057679361fa 100644
--- a/service/b2bi/go.mod
+++ b/service/b2bi/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/b2bi
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/b2bi/go_module_metadata.go b/service/b2bi/go_module_metadata.go
index 91f26afb0fd..1128a31ce9d 100644
--- a/service/b2bi/go_module_metadata.go
+++ b/service/b2bi/go_module_metadata.go
@@ -3,4 +3,4 @@
 package b2bi
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.0-preview.61"
+const goModuleVersion = "1.0.0-preview.62"
diff --git a/service/backup/CHANGELOG.md b/service/backup/CHANGELOG.md
index cdadee24676..825aa46fc9a 100644
--- a/service/backup/CHANGELOG.md
+++ b/service/backup/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.40.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.40.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/backup/go.mod b/service/backup/go.mod
index 1491ff1d9ae..9853bad9aa2 100644
--- a/service/backup/go.mod
+++ b/service/backup/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/backup
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/backup/go_module_metadata.go b/service/backup/go_module_metadata.go
index d35d3049c44..83e1c084b39 100644
--- a/service/backup/go_module_metadata.go
+++ b/service/backup/go_module_metadata.go
@@ -3,4 +3,4 @@
 package backup
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.40.7"
+const goModuleVersion = "1.40.8"
diff --git a/service/backupgateway/CHANGELOG.md b/service/backupgateway/CHANGELOG.md
index 8343fb78925..5e68eeb992a 100644
--- a/service/backupgateway/CHANGELOG.md
+++ b/service/backupgateway/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/backupgateway/go.mod b/service/backupgateway/go.mod
index a97e8d5053b..159a1d3033d 100644
--- a/service/backupgateway/go.mod
+++ b/service/backupgateway/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/backupgateway
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/backupgateway/go_module_metadata.go b/service/backupgateway/go_module_metadata.go
index 91086dd0115..0111646fd92 100644
--- a/service/backupgateway/go_module_metadata.go
+++ b/service/backupgateway/go_module_metadata.go
@@ -3,4 +3,4 @@
 package backupgateway
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.13"
+const goModuleVersion = "1.20.14"
diff --git a/service/backupsearch/CHANGELOG.md b/service/backupsearch/CHANGELOG.md
index 367576185c7..694e7360f6d 100644
--- a/service/backupsearch/CHANGELOG.md
+++ b/service/backupsearch/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/backupsearch/go.mod b/service/backupsearch/go.mod
index 260bc0fed59..7c09625e8c6 100644
--- a/service/backupsearch/go.mod
+++ b/service/backupsearch/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/backupsearch
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/backupsearch/go_module_metadata.go b/service/backupsearch/go_module_metadata.go
index fd73da47dde..ddf83cf9f33 100644
--- a/service/backupsearch/go_module_metadata.go
+++ b/service/backupsearch/go_module_metadata.go
@@ -3,4 +3,4 @@
 package backupsearch
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.6"
+const goModuleVersion = "1.0.7"
diff --git a/service/batch/CHANGELOG.md b/service/batch/CHANGELOG.md
index fa5aafd7833..3b8ed82daa2 100644
--- a/service/batch/CHANGELOG.md
+++ b/service/batch/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.49.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.49.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/batch/go.mod b/service/batch/go.mod
index 03578159a11..db8b4407cdd 100644
--- a/service/batch/go.mod
+++ b/service/batch/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/batch
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/batch/go_module_metadata.go b/service/batch/go_module_metadata.go
index ec2e1f82481..0afd7c9c184 100644
--- a/service/batch/go_module_metadata.go
+++ b/service/batch/go_module_metadata.go
@@ -3,4 +3,4 @@
 package batch
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.49.9"
+const goModuleVersion = "1.49.10"
diff --git a/service/bcmdataexports/CHANGELOG.md b/service/bcmdataexports/CHANGELOG.md
index 4642bb2627c..76e933eba75 100644
--- a/service/bcmdataexports/CHANGELOG.md
+++ b/service/bcmdataexports/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bcmdataexports/go.mod b/service/bcmdataexports/go.mod
index ff774985211..a8665ce6a39 100644
--- a/service/bcmdataexports/go.mod
+++ b/service/bcmdataexports/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bcmdataexports
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bcmdataexports/go_module_metadata.go b/service/bcmdataexports/go_module_metadata.go
index 61f1ecaf53c..d69e5d4679d 100644
--- a/service/bcmdataexports/go_module_metadata.go
+++ b/service/bcmdataexports/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bcmdataexports
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.13"
+const goModuleVersion = "1.7.14"
diff --git a/service/bcmpricingcalculator/CHANGELOG.md b/service/bcmpricingcalculator/CHANGELOG.md
index 9cb3eaf4aff..7e1d9fd30f1 100644
--- a/service/bcmpricingcalculator/CHANGELOG.md
+++ b/service/bcmpricingcalculator/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.2.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.2.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bcmpricingcalculator/go.mod b/service/bcmpricingcalculator/go.mod
index 536bc52e1b3..4683d9ab577 100644
--- a/service/bcmpricingcalculator/go.mod
+++ b/service/bcmpricingcalculator/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bcmpricingcalculator
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bcmpricingcalculator/go_module_metadata.go b/service/bcmpricingcalculator/go_module_metadata.go
index f1fa801814f..a33c0c1581d 100644
--- a/service/bcmpricingcalculator/go_module_metadata.go
+++ b/service/bcmpricingcalculator/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bcmpricingcalculator
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.2.1"
+const goModuleVersion = "1.2.2"
diff --git a/service/bedrock/CHANGELOG.md b/service/bedrock/CHANGELOG.md
index d1e5d6f85fa..7c832e2da37 100644
--- a/service/bedrock/CHANGELOG.md
+++ b/service/bedrock/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bedrock/go.mod b/service/bedrock/go.mod
index c4450e08a3c..6e7763e9970 100644
--- a/service/bedrock/go.mod
+++ b/service/bedrock/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bedrock
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrock/go_module_metadata.go b/service/bedrock/go_module_metadata.go
index 29cd6dd716e..338bccfbb86 100644
--- a/service/bedrock/go_module_metadata.go
+++ b/service/bedrock/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrock
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.4"
+const goModuleVersion = "1.26.5"
diff --git a/service/bedrockagent/CHANGELOG.md b/service/bedrockagent/CHANGELOG.md
index fd9d237bbb8..068d1c3632a 100644
--- a/service/bedrockagent/CHANGELOG.md
+++ b/service/bedrockagent/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bedrockagent/go.mod b/service/bedrockagent/go.mod
index 30ce869d252..9f43f13dcb0 100644
--- a/service/bedrockagent/go.mod
+++ b/service/bedrockagent/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bedrockagent
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrockagent/go_module_metadata.go b/service/bedrockagent/go_module_metadata.go
index f60c8439f9c..91b9f0060f9 100644
--- a/service/bedrockagent/go_module_metadata.go
+++ b/service/bedrockagent/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrockagent
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.1"
+const goModuleVersion = "1.34.2"
diff --git a/service/bedrockagentruntime/CHANGELOG.md b/service/bedrockagentruntime/CHANGELOG.md
index 68dac43d94d..b94e40a030d 100644
--- a/service/bedrockagentruntime/CHANGELOG.md
+++ b/service/bedrockagentruntime/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.35.0 (2025-01-31)
+
+* **Feature**: This change is to deprecate the existing citation field under RetrieveAndGenerateStream API response in lieu of GeneratedResponsePart and RetrievedReferences
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.0 (2025-01-30)
 
 * **Feature**: Add a 'reason' field to InternalServerException
diff --git a/service/bedrockagentruntime/deserializers.go b/service/bedrockagentruntime/deserializers.go
index 92a20794795..2329f329df7 100644
--- a/service/bedrockagentruntime/deserializers.go
+++ b/service/bedrockagentruntime/deserializers.go
@@ -9133,6 +9133,16 @@ func awsRestjson1_deserializeDocumentCitationEvent(v **types.CitationEvent, valu
 				return err
 			}
 
+		case "generatedResponsePart":
+			if err := awsRestjson1_deserializeDocumentGeneratedResponsePart(&sv.GeneratedResponsePart, value); err != nil {
+				return err
+			}
+
+		case "retrievedReferences":
+			if err := awsRestjson1_deserializeDocumentRetrievedReferences(&sv.RetrievedReferences, value); err != nil {
+				return err
+			}
+
 		default:
 			_, _ = key, value
 
diff --git a/service/bedrockagentruntime/go.mod b/service/bedrockagentruntime/go.mod
index 1c8790a0db1..d3dc7a76c31 100644
--- a/service/bedrockagentruntime/go.mod
+++ b/service/bedrockagentruntime/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/bedrockagentruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrockagentruntime/go_module_metadata.go b/service/bedrockagentruntime/go_module_metadata.go
index e15842197b7..4038c0ee37d 100644
--- a/service/bedrockagentruntime/go_module_metadata.go
+++ b/service/bedrockagentruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrockagentruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.0"
+const goModuleVersion = "1.35.0"
diff --git a/service/bedrockagentruntime/types/types.go b/service/bedrockagentruntime/types/types.go
index e2a92615e7f..0ad1231b8ee 100644
--- a/service/bedrockagentruntime/types/types.go
+++ b/service/bedrockagentruntime/types/types.go
@@ -502,8 +502,17 @@ type Citation struct {
 type CitationEvent struct {
 
 	// The citation.
+	//
+	// Deprecated: Citation is deprecated. Please use GeneratedResponsePart and
+	// RetrievedReferences for citation event.
 	Citation *Citation
 
+	// The generated response to the citation event.
+	GeneratedResponsePart *GeneratedResponsePart
+
+	// The retrieved references of the citation event.
+	RetrievedReferences []RetrievedReference
+
 	noSmithyDocumentSerde
 }
 
diff --git a/service/bedrockdataautomation/CHANGELOG.md b/service/bedrockdataautomation/CHANGELOG.md
index 7d3f4c0d5c3..5dad6485835 100644
--- a/service/bedrockdataautomation/CHANGELOG.md
+++ b/service/bedrockdataautomation/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bedrockdataautomation/go.mod b/service/bedrockdataautomation/go.mod
index 2e581d69b98..89636b60c7e 100644
--- a/service/bedrockdataautomation/go.mod
+++ b/service/bedrockdataautomation/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bedrockdataautomation
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrockdataautomation/go_module_metadata.go b/service/bedrockdataautomation/go_module_metadata.go
index 9eb45ae670c..5b0e4c77e76 100644
--- a/service/bedrockdataautomation/go_module_metadata.go
+++ b/service/bedrockdataautomation/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrockdataautomation
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.7"
+const goModuleVersion = "1.0.8"
diff --git a/service/bedrockdataautomationruntime/CHANGELOG.md b/service/bedrockdataautomationruntime/CHANGELOG.md
index 94cec19bcb4..9eeb65c4d32 100644
--- a/service/bedrockdataautomationruntime/CHANGELOG.md
+++ b/service/bedrockdataautomationruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bedrockdataautomationruntime/go.mod b/service/bedrockdataautomationruntime/go.mod
index 709f5c9aee6..86666fa610b 100644
--- a/service/bedrockdataautomationruntime/go.mod
+++ b/service/bedrockdataautomationruntime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/bedrockdataautomationruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrockdataautomationruntime/go_module_metadata.go b/service/bedrockdataautomationruntime/go_module_metadata.go
index 89e29903a5d..146d671737f 100644
--- a/service/bedrockdataautomationruntime/go_module_metadata.go
+++ b/service/bedrockdataautomationruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrockdataautomationruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.7"
+const goModuleVersion = "1.0.8"
diff --git a/service/bedrockruntime/CHANGELOG.md b/service/bedrockruntime/CHANGELOG.md
index ce7d8c61d97..67845ffa73d 100644
--- a/service/bedrockruntime/CHANGELOG.md
+++ b/service/bedrockruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.3 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/bedrockruntime/go.mod b/service/bedrockruntime/go.mod
index 6fcc7b98fde..127ac314e75 100644
--- a/service/bedrockruntime/go.mod
+++ b/service/bedrockruntime/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/bedrockruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/bedrockruntime/go_module_metadata.go b/service/bedrockruntime/go_module_metadata.go
index bb4fb07d1b5..2088f5d9df1 100644
--- a/service/bedrockruntime/go_module_metadata.go
+++ b/service/bedrockruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package bedrockruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.2"
+const goModuleVersion = "1.24.3"
diff --git a/service/billing/CHANGELOG.md b/service/billing/CHANGELOG.md
index dd1f77a90a6..a725e80eb7b 100644
--- a/service/billing/CHANGELOG.md
+++ b/service/billing/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/billing/go.mod b/service/billing/go.mod
index f70b9b96589..ebc0955f9d0 100644
--- a/service/billing/go.mod
+++ b/service/billing/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/billing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/billing/go_module_metadata.go b/service/billing/go_module_metadata.go
index e109e4254d1..a06cd9c8cd0 100644
--- a/service/billing/go_module_metadata.go
+++ b/service/billing/go_module_metadata.go
@@ -3,4 +3,4 @@
 package billing
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.5"
+const goModuleVersion = "1.1.6"
diff --git a/service/billingconductor/CHANGELOG.md b/service/billingconductor/CHANGELOG.md
index 43067f6ae90..0a4d1a9e4b7 100644
--- a/service/billingconductor/CHANGELOG.md
+++ b/service/billingconductor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/billingconductor/go.mod b/service/billingconductor/go.mod
index 7d14f83dd42..3d5537d57af 100644
--- a/service/billingconductor/go.mod
+++ b/service/billingconductor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/billingconductor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/billingconductor/go_module_metadata.go b/service/billingconductor/go_module_metadata.go
index fb259122d72..08c89ae2f03 100644
--- a/service/billingconductor/go_module_metadata.go
+++ b/service/billingconductor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package billingconductor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.13"
+const goModuleVersion = "1.20.14"
diff --git a/service/braket/CHANGELOG.md b/service/braket/CHANGELOG.md
index 52941b4d215..bc6fef04f9a 100644
--- a/service/braket/CHANGELOG.md
+++ b/service/braket/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/braket/go.mod b/service/braket/go.mod
index 5838df39ed8..eda4995d98c 100644
--- a/service/braket/go.mod
+++ b/service/braket/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/braket
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/braket/go_module_metadata.go b/service/braket/go_module_metadata.go
index dd49538eefb..78617fe850d 100644
--- a/service/braket/go_module_metadata.go
+++ b/service/braket/go_module_metadata.go
@@ -3,4 +3,4 @@
 package braket
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.14"
+const goModuleVersion = "1.31.15"
diff --git a/service/budgets/CHANGELOG.md b/service/budgets/CHANGELOG.md
index 4b99f31c026..6887e463a19 100644
--- a/service/budgets/CHANGELOG.md
+++ b/service/budgets/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/budgets/go.mod b/service/budgets/go.mod
index fc929ebb014..958811d2231 100644
--- a/service/budgets/go.mod
+++ b/service/budgets/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/budgets
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/budgets/go_module_metadata.go b/service/budgets/go_module_metadata.go
index 726312a23f5..c36951f9e17 100644
--- a/service/budgets/go_module_metadata.go
+++ b/service/budgets/go_module_metadata.go
@@ -3,4 +3,4 @@
 package budgets
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.7"
+const goModuleVersion = "1.29.8"
diff --git a/service/chatbot/CHANGELOG.md b/service/chatbot/CHANGELOG.md
index 80db61f69c5..fb2d57b6a76 100644
--- a/service/chatbot/CHANGELOG.md
+++ b/service/chatbot/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.9.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.9.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chatbot/go.mod b/service/chatbot/go.mod
index 3c84641b6d6..17fe5c92810 100644
--- a/service/chatbot/go.mod
+++ b/service/chatbot/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chatbot
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chatbot/go_module_metadata.go b/service/chatbot/go_module_metadata.go
index ecaec9172c3..7b84f7dd761 100644
--- a/service/chatbot/go_module_metadata.go
+++ b/service/chatbot/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chatbot
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.9.7"
+const goModuleVersion = "1.9.8"
diff --git a/service/chime/CHANGELOG.md b/service/chime/CHANGELOG.md
index 15d3bbedfb1..036c12ed007 100644
--- a/service/chime/CHANGELOG.md
+++ b/service/chime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chime/go.mod b/service/chime/go.mod
index bc76b3c0e80..92668ef298f 100644
--- a/service/chime/go.mod
+++ b/service/chime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chime/go_module_metadata.go b/service/chime/go_module_metadata.go
index 22113df9a6b..2b5285d8be0 100644
--- a/service/chime/go_module_metadata.go
+++ b/service/chime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/chimesdkidentity/CHANGELOG.md b/service/chimesdkidentity/CHANGELOG.md
index 570f302c6aa..e37aa1844a3 100644
--- a/service/chimesdkidentity/CHANGELOG.md
+++ b/service/chimesdkidentity/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chimesdkidentity/go.mod b/service/chimesdkidentity/go.mod
index 97f9cf6bd1d..d68c5fc354e 100644
--- a/service/chimesdkidentity/go.mod
+++ b/service/chimesdkidentity/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chimesdkidentity
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chimesdkidentity/go_module_metadata.go b/service/chimesdkidentity/go_module_metadata.go
index a4c5beede20..736cecef4c8 100644
--- a/service/chimesdkidentity/go_module_metadata.go
+++ b/service/chimesdkidentity/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chimesdkidentity
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.13"
+const goModuleVersion = "1.22.14"
diff --git a/service/chimesdkmediapipelines/CHANGELOG.md b/service/chimesdkmediapipelines/CHANGELOG.md
index 4038610b718..27f081b80c2 100644
--- a/service/chimesdkmediapipelines/CHANGELOG.md
+++ b/service/chimesdkmediapipelines/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chimesdkmediapipelines/go.mod b/service/chimesdkmediapipelines/go.mod
index d0b27162487..f9210ec4d20 100644
--- a/service/chimesdkmediapipelines/go.mod
+++ b/service/chimesdkmediapipelines/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chimesdkmediapipelines/go_module_metadata.go b/service/chimesdkmediapipelines/go_module_metadata.go
index 1c4345fb537..1894e0a30c3 100644
--- a/service/chimesdkmediapipelines/go_module_metadata.go
+++ b/service/chimesdkmediapipelines/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chimesdkmediapipelines
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.8"
+const goModuleVersion = "1.21.9"
diff --git a/service/chimesdkmeetings/CHANGELOG.md b/service/chimesdkmeetings/CHANGELOG.md
index 7efcd6fd620..55070e2a608 100644
--- a/service/chimesdkmeetings/CHANGELOG.md
+++ b/service/chimesdkmeetings/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chimesdkmeetings/go.mod b/service/chimesdkmeetings/go.mod
index b0f003d0822..6d8a7992a46 100644
--- a/service/chimesdkmeetings/go.mod
+++ b/service/chimesdkmeetings/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chimesdkmeetings
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chimesdkmeetings/go_module_metadata.go b/service/chimesdkmeetings/go_module_metadata.go
index 0db04fc70ea..f1913807300 100644
--- a/service/chimesdkmeetings/go_module_metadata.go
+++ b/service/chimesdkmeetings/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chimesdkmeetings
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/chimesdkmessaging/CHANGELOG.md b/service/chimesdkmessaging/CHANGELOG.md
index 820f6a78b3e..092307e54f8 100644
--- a/service/chimesdkmessaging/CHANGELOG.md
+++ b/service/chimesdkmessaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chimesdkmessaging/go.mod b/service/chimesdkmessaging/go.mod
index 3fb0c404f90..38146221504 100644
--- a/service/chimesdkmessaging/go.mod
+++ b/service/chimesdkmessaging/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chimesdkmessaging
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chimesdkmessaging/go_module_metadata.go b/service/chimesdkmessaging/go_module_metadata.go
index 80e110f8157..b5562e67186 100644
--- a/service/chimesdkmessaging/go_module_metadata.go
+++ b/service/chimesdkmessaging/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chimesdkmessaging
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/chimesdkvoice/CHANGELOG.md b/service/chimesdkvoice/CHANGELOG.md
index 5d12cd15aaa..5cc74df608c 100644
--- a/service/chimesdkvoice/CHANGELOG.md
+++ b/service/chimesdkvoice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/chimesdkvoice/go.mod b/service/chimesdkvoice/go.mod
index 7af58fe30ab..e7625972e49 100644
--- a/service/chimesdkvoice/go.mod
+++ b/service/chimesdkvoice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/chimesdkvoice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/chimesdkvoice/go_module_metadata.go b/service/chimesdkvoice/go_module_metadata.go
index 79a6a027ba0..9e66420fbb7 100644
--- a/service/chimesdkvoice/go_module_metadata.go
+++ b/service/chimesdkvoice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package chimesdkvoice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.6"
+const goModuleVersion = "1.20.7"
diff --git a/service/cleanrooms/CHANGELOG.md b/service/cleanrooms/CHANGELOG.md
index e3c3e5e76d8..62543c5b432 100644
--- a/service/cleanrooms/CHANGELOG.md
+++ b/service/cleanrooms/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cleanrooms/go.mod b/service/cleanrooms/go.mod
index 7f2bd30b07e..133c412b71f 100644
--- a/service/cleanrooms/go.mod
+++ b/service/cleanrooms/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cleanrooms
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cleanrooms/go_module_metadata.go b/service/cleanrooms/go_module_metadata.go
index 8f9050a9a12..7bad19197d1 100644
--- a/service/cleanrooms/go_module_metadata.go
+++ b/service/cleanrooms/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cleanrooms
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.6"
+const goModuleVersion = "1.21.7"
diff --git a/service/cleanroomsml/CHANGELOG.md b/service/cleanroomsml/CHANGELOG.md
index b511d949979..12bfdc4e825 100644
--- a/service/cleanroomsml/CHANGELOG.md
+++ b/service/cleanroomsml/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cleanroomsml/go.mod b/service/cleanroomsml/go.mod
index fcacc28624f..e25e7df1a45 100644
--- a/service/cleanroomsml/go.mod
+++ b/service/cleanroomsml/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cleanroomsml
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cleanroomsml/go_module_metadata.go b/service/cleanroomsml/go_module_metadata.go
index 55e7d4b713b..c8be7cebecc 100644
--- a/service/cleanroomsml/go_module_metadata.go
+++ b/service/cleanroomsml/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cleanroomsml
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.6"
+const goModuleVersion = "1.11.7"
diff --git a/service/cloud9/CHANGELOG.md b/service/cloud9/CHANGELOG.md
index e33eb021c89..0bce8b1f336 100644
--- a/service/cloud9/CHANGELOG.md
+++ b/service/cloud9/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloud9/go.mod b/service/cloud9/go.mod
index 6f88e6bba2f..616e39c2692 100644
--- a/service/cloud9/go.mod
+++ b/service/cloud9/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloud9
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloud9/go_module_metadata.go b/service/cloud9/go_module_metadata.go
index 9e9b4cdd437..5cacf8ddedb 100644
--- a/service/cloud9/go_module_metadata.go
+++ b/service/cloud9/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloud9
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.14"
+const goModuleVersion = "1.28.15"
diff --git a/service/cloudcontrol/CHANGELOG.md b/service/cloudcontrol/CHANGELOG.md
index a92b04989ea..049f4051989 100644
--- a/service/cloudcontrol/CHANGELOG.md
+++ b/service/cloudcontrol/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.23.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudcontrol/api_op_GetResourceRequestStatus.go b/service/cloudcontrol/api_op_GetResourceRequestStatus.go
index 798ef5c8535..cbc305774d9 100644
--- a/service/cloudcontrol/api_op_GetResourceRequestStatus.go
+++ b/service/cloudcontrol/api_op_GetResourceRequestStatus.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -324,52 +323,46 @@ func (w *ResourceRequestSuccessWaiter) WaitForOutput(ctx context.Context, params
 func resourceRequestSuccessStateRetryable(ctx context.Context, input *GetResourceRequestStatusInput, output *GetResourceRequestStatusOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProgressEvent.OperationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProgressEvent
+		var v2 types.OperationStatus
+		if v1 != nil {
+			v3 := v1.OperationStatus
+			v2 = v3
 		}
-
 		expectedValue := "SUCCESS"
-		value, ok := pathValue.(types.OperationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.OperationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProgressEvent.OperationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProgressEvent
+		var v2 types.OperationStatus
+		if v1 != nil {
+			v3 := v1.OperationStatus
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.OperationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.OperationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProgressEvent.OperationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProgressEvent
+		var v2 types.OperationStatus
+		if v1 != nil {
+			v3 := v1.OperationStatus
+			v2 = v3
 		}
-
 		expectedValue := "CANCEL_COMPLETE"
-		value, ok := pathValue.(types.OperationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.OperationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/cloudcontrol/generated.json b/service/cloudcontrol/generated.json
index d6d0b1f1493..374877c00de 100644
--- a/service/cloudcontrol/generated.json
+++ b/service/cloudcontrol/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/cloudcontrol/go.mod b/service/cloudcontrol/go.mod
index 42c983bef67..cd8c55b36fb 100644
--- a/service/cloudcontrol/go.mod
+++ b/service/cloudcontrol/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/cloudcontrol
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/cloudcontrol/go.sum b/service/cloudcontrol/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/cloudcontrol/go.sum
+++ b/service/cloudcontrol/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/cloudcontrol/go_module_metadata.go b/service/cloudcontrol/go_module_metadata.go
index 3ac634eabe3..89b3d0f6e6d 100644
--- a/service/cloudcontrol/go_module_metadata.go
+++ b/service/cloudcontrol/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudcontrol
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.9"
+const goModuleVersion = "1.23.10"
diff --git a/service/clouddirectory/CHANGELOG.md b/service/clouddirectory/CHANGELOG.md
index 63023ae22de..5434fb98297 100644
--- a/service/clouddirectory/CHANGELOG.md
+++ b/service/clouddirectory/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/clouddirectory/go.mod b/service/clouddirectory/go.mod
index ec5ca7a411b..590aa4eaca9 100644
--- a/service/clouddirectory/go.mod
+++ b/service/clouddirectory/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/clouddirectory
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/clouddirectory/go_module_metadata.go b/service/clouddirectory/go_module_metadata.go
index dc8f697e2e6..4df7d685390 100644
--- a/service/clouddirectory/go_module_metadata.go
+++ b/service/clouddirectory/go_module_metadata.go
@@ -3,4 +3,4 @@
 package clouddirectory
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/cloudformation/CHANGELOG.md b/service/cloudformation/CHANGELOG.md
index ec18de99218..b1d4bc68f93 100644
--- a/service/cloudformation/CHANGELOG.md
+++ b/service/cloudformation/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.56.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.56.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudformation/api_op_DescribeChangeSet.go b/service/cloudformation/api_op_DescribeChangeSet.go
index 03584c95db5..3e82d2c5c3d 100644
--- a/service/cloudformation/api_op_DescribeChangeSet.go
+++ b/service/cloudformation/api_op_DescribeChangeSet.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -432,35 +431,21 @@ func (w *ChangeSetCreateCompleteWaiter) WaitForOutput(ctx context.Context, param
 func changeSetCreateCompleteStateRetryable(ctx context.Context, input *DescribeChangeSetInput, output *DescribeChangeSetOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_COMPLETE"
-		value, ok := pathValue.(types.ChangeSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChangeSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ChangeSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChangeSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/cloudformation/api_op_DescribeStacks.go b/service/cloudformation/api_op_DescribeStacks.go
index f9edd9347cd..5e0d8bb2a02 100644
--- a/service/cloudformation/api_op_DescribeStacks.go
+++ b/service/cloudformation/api_op_DescribeStacks.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -348,29 +347,18 @@ func (w *StackCreateCompleteWaiter) WaitForOutput(ctx context.Context, params *D
 func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStacksInput, output *DescribeStacksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "CREATE_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -380,29 +368,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -412,29 +389,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_IN_PROGRESS"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -444,29 +410,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_COMPLETE_CLEANUP_IN_PROGRESS"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -476,29 +431,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_FAILED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -508,29 +452,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_IN_PROGRESS"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -540,29 +473,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_FAILED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -572,29 +494,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -604,29 +515,18 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -636,122 +536,107 @@ func stackCreateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "CREATE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "DELETE_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "DELETE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "ROLLBACK_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -935,29 +820,18 @@ func (w *StackDeleteCompleteWaiter) WaitForOutput(ctx context.Context, params *D
 func stackDeleteCompleteStateRetryable(ctx context.Context, input *DescribeStacksInput, output *DescribeStacksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "DELETE_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -979,170 +853,149 @@ func stackDeleteCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "DELETE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "CREATE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_IN_PROGRESS"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1494,29 +1347,18 @@ func (w *StackImportCompleteWaiter) WaitForOutput(ctx context.Context, params *D
 func stackImportCompleteStateRetryable(ctx context.Context, input *DescribeStacksInput, output *DescribeStacksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "IMPORT_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1526,122 +1368,107 @@ func stackImportCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "ROLLBACK_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "IMPORT_ROLLBACK_IN_PROGRESS"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "IMPORT_ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "IMPORT_ROLLBACK_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1825,29 +1652,18 @@ func (w *StackRollbackCompleteWaiter) WaitForOutput(ctx context.Context, params
 func stackRollbackCompleteStateRetryable(ctx context.Context, input *DescribeStacksInput, output *DescribeStacksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1857,74 +1673,65 @@ func stackRollbackCompleteStateRetryable(ctx context.Context, input *DescribeSta
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "DELETE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -2108,29 +1915,18 @@ func (w *StackUpdateCompleteWaiter) WaitForOutput(ctx context.Context, params *D
 func stackUpdateCompleteStateRetryable(ctx context.Context, input *DescribeStacksInput, output *DescribeStacksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_COMPLETE"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -2140,74 +1936,65 @@ func stackUpdateCompleteStateRetryable(ctx context.Context, input *DescribeStack
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Stacks[].StackStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Stacks
+		var v2 []types.StackStatus
+		for _, v := range v1 {
+			v3 := v.StackStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "UPDATE_ROLLBACK_COMPLETE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.StackStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.StackStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/cloudformation/api_op_DescribeTypeRegistration.go b/service/cloudformation/api_op_DescribeTypeRegistration.go
index 53753972488..c201485b297 100644
--- a/service/cloudformation/api_op_DescribeTypeRegistration.go
+++ b/service/cloudformation/api_op_DescribeTypeRegistration.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -340,35 +339,21 @@ func (w *TypeRegistrationCompleteWaiter) WaitForOutput(ctx context.Context, para
 func typeRegistrationCompleteStateRetryable(ctx context.Context, input *DescribeTypeRegistrationInput, output *DescribeTypeRegistrationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProgressStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ProgressStatus
 		expectedValue := "COMPLETE"
-		value, ok := pathValue.(types.RegistrationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RegistrationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProgressStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ProgressStatus
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.RegistrationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RegistrationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/cloudformation/generated.json b/service/cloudformation/generated.json
index 733157974c1..760e34e1b72 100644
--- a/service/cloudformation/generated.json
+++ b/service/cloudformation/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/cloudformation/go.mod b/service/cloudformation/go.mod
index 077c8165f32..4bc81258835 100644
--- a/service/cloudformation/go.mod
+++ b/service/cloudformation/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/cloudformation
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/cloudformation/go.sum b/service/cloudformation/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/cloudformation/go.sum
+++ b/service/cloudformation/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/cloudformation/go_module_metadata.go b/service/cloudformation/go_module_metadata.go
index 1e073a4322f..cc216bdb4b0 100644
--- a/service/cloudformation/go_module_metadata.go
+++ b/service/cloudformation/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudformation
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.56.9"
+const goModuleVersion = "1.56.10"
diff --git a/service/cloudfront/CHANGELOG.md b/service/cloudfront/CHANGELOG.md
index be7b1f010ee..142aee37d20 100644
--- a/service/cloudfront/CHANGELOG.md
+++ b/service/cloudfront/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.44.8 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.44.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudfront/api_op_GetDistribution.go b/service/cloudfront/api_op_GetDistribution.go
index 7870f14a667..512198978ee 100644
--- a/service/cloudfront/api_op_GetDistribution.go
+++ b/service/cloudfront/api_op_GetDistribution.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -321,18 +320,18 @@ func (w *DistributionDeployedWaiter) WaitForOutput(ctx context.Context, params *
 func distributionDeployedStateRetryable(ctx context.Context, input *GetDistributionInput, output *GetDistributionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Distribution.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Distribution
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Deployed"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/cloudfront/api_op_GetInvalidation.go b/service/cloudfront/api_op_GetInvalidation.go
index fd0a096eae7..b0cef6fd802 100644
--- a/service/cloudfront/api_op_GetInvalidation.go
+++ b/service/cloudfront/api_op_GetInvalidation.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -323,18 +322,18 @@ func (w *InvalidationCompletedWaiter) WaitForOutput(ctx context.Context, params
 func invalidationCompletedStateRetryable(ctx context.Context, input *GetInvalidationInput, output *GetInvalidationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Invalidation.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Invalidation
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Completed"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/cloudfront/api_op_GetStreamingDistribution.go b/service/cloudfront/api_op_GetStreamingDistribution.go
index d65c32bd7b5..fab0ffa74c5 100644
--- a/service/cloudfront/api_op_GetStreamingDistribution.go
+++ b/service/cloudfront/api_op_GetStreamingDistribution.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -324,18 +323,18 @@ func (w *StreamingDistributionDeployedWaiter) WaitForOutput(ctx context.Context,
 func streamingDistributionDeployedStateRetryable(ctx context.Context, input *GetStreamingDistributionInput, output *GetStreamingDistributionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("StreamingDistribution.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.StreamingDistribution
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Deployed"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/cloudfront/generated.json b/service/cloudfront/generated.json
index 9c85a6aa410..e55eb16b527 100644
--- a/service/cloudfront/generated.json
+++ b/service/cloudfront/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/cloudfront/go.mod b/service/cloudfront/go.mod
index b4b81f82321..36ee0136a5c 100644
--- a/service/cloudfront/go.mod
+++ b/service/cloudfront/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/cloudfront
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/cloudfront/go.sum b/service/cloudfront/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/cloudfront/go.sum
+++ b/service/cloudfront/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/cloudfront/go_module_metadata.go b/service/cloudfront/go_module_metadata.go
index 2fb28759bd0..e5f1f56b243 100644
--- a/service/cloudfront/go_module_metadata.go
+++ b/service/cloudfront/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudfront
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.7"
+const goModuleVersion = "1.44.8"
diff --git a/service/cloudfrontkeyvaluestore/CHANGELOG.md b/service/cloudfrontkeyvaluestore/CHANGELOG.md
index 86e45592bf7..303a40291e8 100644
--- a/service/cloudfrontkeyvaluestore/CHANGELOG.md
+++ b/service/cloudfrontkeyvaluestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudfrontkeyvaluestore/go.mod b/service/cloudfrontkeyvaluestore/go.mod
index c39e8277aa9..4c6bc25a531 100644
--- a/service/cloudfrontkeyvaluestore/go.mod
+++ b/service/cloudfrontkeyvaluestore/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudfrontkeyvaluestore/go_module_metadata.go b/service/cloudfrontkeyvaluestore/go_module_metadata.go
index f75a41c2369..27a02f3dca4 100644
--- a/service/cloudfrontkeyvaluestore/go_module_metadata.go
+++ b/service/cloudfrontkeyvaluestore/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudfrontkeyvaluestore
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.13"
+const goModuleVersion = "1.8.14"
diff --git a/service/cloudhsm/CHANGELOG.md b/service/cloudhsm/CHANGELOG.md
index e02a071c47b..1002c5ea1dd 100644
--- a/service/cloudhsm/CHANGELOG.md
+++ b/service/cloudhsm/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudhsm/go.mod b/service/cloudhsm/go.mod
index 231b7466d28..8755a32cde1 100644
--- a/service/cloudhsm/go.mod
+++ b/service/cloudhsm/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudhsm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudhsm/go_module_metadata.go b/service/cloudhsm/go_module_metadata.go
index d651bc389ec..6c66c35d76e 100644
--- a/service/cloudhsm/go_module_metadata.go
+++ b/service/cloudhsm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudhsm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/cloudhsmv2/CHANGELOG.md b/service/cloudhsmv2/CHANGELOG.md
index 0938776bc39..dfd7a44798f 100644
--- a/service/cloudhsmv2/CHANGELOG.md
+++ b/service/cloudhsmv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudhsmv2/go.mod b/service/cloudhsmv2/go.mod
index a9328784c73..b9f962d328d 100644
--- a/service/cloudhsmv2/go.mod
+++ b/service/cloudhsmv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudhsmv2/go_module_metadata.go b/service/cloudhsmv2/go_module_metadata.go
index c73d6b57330..d75eacd9fdf 100644
--- a/service/cloudhsmv2/go_module_metadata.go
+++ b/service/cloudhsmv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudhsmv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.5"
+const goModuleVersion = "1.29.6"
diff --git a/service/cloudsearch/CHANGELOG.md b/service/cloudsearch/CHANGELOG.md
index fe921256f93..8b32d34b108 100644
--- a/service/cloudsearch/CHANGELOG.md
+++ b/service/cloudsearch/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudsearch/go.mod b/service/cloudsearch/go.mod
index af0b15249ed..ccc5516e2cd 100644
--- a/service/cloudsearch/go.mod
+++ b/service/cloudsearch/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudsearch
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudsearch/go_module_metadata.go b/service/cloudsearch/go_module_metadata.go
index a1787fbac97..a52e3c645fa 100644
--- a/service/cloudsearch/go_module_metadata.go
+++ b/service/cloudsearch/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudsearch
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.12"
+const goModuleVersion = "1.26.13"
diff --git a/service/cloudsearchdomain/CHANGELOG.md b/service/cloudsearchdomain/CHANGELOG.md
index b9885c072c1..f37bc177b73 100644
--- a/service/cloudsearchdomain/CHANGELOG.md
+++ b/service/cloudsearchdomain/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudsearchdomain/go.mod b/service/cloudsearchdomain/go.mod
index fef2d13ee60..4a7268aa780 100644
--- a/service/cloudsearchdomain/go.mod
+++ b/service/cloudsearchdomain/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudsearchdomain
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudsearchdomain/go_module_metadata.go b/service/cloudsearchdomain/go_module_metadata.go
index 4d341664a5d..a9054a6ffa6 100644
--- a/service/cloudsearchdomain/go_module_metadata.go
+++ b/service/cloudsearchdomain/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudsearchdomain
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/cloudtrail/CHANGELOG.md b/service/cloudtrail/CHANGELOG.md
index 37d16d2a15d..6d95ebbf243 100644
--- a/service/cloudtrail/CHANGELOG.md
+++ b/service/cloudtrail/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.47.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.47.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudtrail/go.mod b/service/cloudtrail/go.mod
index 2521e234d56..ab4ff7619dc 100644
--- a/service/cloudtrail/go.mod
+++ b/service/cloudtrail/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudtrail
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudtrail/go_module_metadata.go b/service/cloudtrail/go_module_metadata.go
index c02a4f8d9b0..9deabdb1e44 100644
--- a/service/cloudtrail/go_module_metadata.go
+++ b/service/cloudtrail/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudtrail
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.47.1"
+const goModuleVersion = "1.47.2"
diff --git a/service/cloudtraildata/CHANGELOG.md b/service/cloudtraildata/CHANGELOG.md
index 569f6da3619..a781b34286b 100644
--- a/service/cloudtraildata/CHANGELOG.md
+++ b/service/cloudtraildata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudtraildata/go.mod b/service/cloudtraildata/go.mod
index 908bb230cb1..095cad4b9dd 100644
--- a/service/cloudtraildata/go.mod
+++ b/service/cloudtraildata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudtraildata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudtraildata/go_module_metadata.go b/service/cloudtraildata/go_module_metadata.go
index fac314259af..9d5865ed78f 100644
--- a/service/cloudtraildata/go_module_metadata.go
+++ b/service/cloudtraildata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudtraildata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.13"
+const goModuleVersion = "1.11.14"
diff --git a/service/cloudwatch/CHANGELOG.md b/service/cloudwatch/CHANGELOG.md
index 2106c31d272..9989602c52a 100644
--- a/service/cloudwatch/CHANGELOG.md
+++ b/service/cloudwatch/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.43.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.43.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudwatch/go.mod b/service/cloudwatch/go.mod
index 6f1303d4900..69e16fd9b35 100644
--- a/service/cloudwatch/go.mod
+++ b/service/cloudwatch/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatch
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudwatch/go_module_metadata.go b/service/cloudwatch/go_module_metadata.go
index ceb0d2d6bda..fd4783e4cd5 100644
--- a/service/cloudwatch/go_module_metadata.go
+++ b/service/cloudwatch/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudwatch
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.43.11"
+const goModuleVersion = "1.43.12"
diff --git a/service/cloudwatchevents/CHANGELOG.md b/service/cloudwatchevents/CHANGELOG.md
index 2ee84ddb5a8..3acf3288ac0 100644
--- a/service/cloudwatchevents/CHANGELOG.md
+++ b/service/cloudwatchevents/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudwatchevents/go.mod b/service/cloudwatchevents/go.mod
index a22e43ef075..dfc3a700c0c 100644
--- a/service/cloudwatchevents/go.mod
+++ b/service/cloudwatchevents/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatchevents
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudwatchevents/go_module_metadata.go b/service/cloudwatchevents/go_module_metadata.go
index fd8f8cfd693..562bea5a748 100644
--- a/service/cloudwatchevents/go_module_metadata.go
+++ b/service/cloudwatchevents/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudwatchevents
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.15"
+const goModuleVersion = "1.27.16"
diff --git a/service/cloudwatchlogs/CHANGELOG.md b/service/cloudwatchlogs/CHANGELOG.md
index 416ae1613b1..87a9d4f3eb4 100644
--- a/service/cloudwatchlogs/CHANGELOG.md
+++ b/service/cloudwatchlogs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cloudwatchlogs/go.mod b/service/cloudwatchlogs/go.mod
index adcea4cda86..7c193d3a30e 100644
--- a/service/cloudwatchlogs/go.mod
+++ b/service/cloudwatchlogs/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cloudwatchlogs/go_module_metadata.go b/service/cloudwatchlogs/go_module_metadata.go
index 8a7034b2da9..6689a4b5917 100644
--- a/service/cloudwatchlogs/go_module_metadata.go
+++ b/service/cloudwatchlogs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cloudwatchlogs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.9"
+const goModuleVersion = "1.45.10"
diff --git a/service/codeartifact/CHANGELOG.md b/service/codeartifact/CHANGELOG.md
index b92b20683bf..e48f0105e33 100644
--- a/service/codeartifact/CHANGELOG.md
+++ b/service/codeartifact/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codeartifact/go.mod b/service/codeartifact/go.mod
index d1984a523a5..1a9eadd684e 100644
--- a/service/codeartifact/go.mod
+++ b/service/codeartifact/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codeartifact
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codeartifact/go_module_metadata.go b/service/codeartifact/go_module_metadata.go
index 737599b69f8..69ee1e0759b 100644
--- a/service/codeartifact/go_module_metadata.go
+++ b/service/codeartifact/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codeartifact
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.13"
+const goModuleVersion = "1.33.14"
diff --git a/service/codebuild/CHANGELOG.md b/service/codebuild/CHANGELOG.md
index bbf93ec7326..6bed7ebac51 100644
--- a/service/codebuild/CHANGELOG.md
+++ b/service/codebuild/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.51.0 (2025-01-31)
+
+* **Feature**: Added support for CodeBuild self-hosted Buildkite runner builds
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.50.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codebuild/go.mod b/service/codebuild/go.mod
index 5ae6659607a..277e45ed04d 100644
--- a/service/codebuild/go.mod
+++ b/service/codebuild/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codebuild
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codebuild/go_module_metadata.go b/service/codebuild/go_module_metadata.go
index de0924062ef..a0fc640c9fe 100644
--- a/service/codebuild/go_module_metadata.go
+++ b/service/codebuild/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codebuild
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.50.4"
+const goModuleVersion = "1.51.0"
diff --git a/service/codebuild/types/enums.go b/service/codebuild/types/enums.go
index a4d3d80f42c..e3e4477db3b 100644
--- a/service/codebuild/types/enums.go
+++ b/service/codebuild/types/enums.go
@@ -1047,8 +1047,9 @@ type WebhookBuildType string
 
 // Enum values for WebhookBuildType
 const (
-	WebhookBuildTypeBuild      WebhookBuildType = "BUILD"
-	WebhookBuildTypeBuildBatch WebhookBuildType = "BUILD_BATCH"
+	WebhookBuildTypeBuild                WebhookBuildType = "BUILD"
+	WebhookBuildTypeBuildBatch           WebhookBuildType = "BUILD_BATCH"
+	WebhookBuildTypeRunnerBuildkiteBuild WebhookBuildType = "RUNNER_BUILDKITE_BUILD"
 )
 
 // Values returns all known values for WebhookBuildType. Note that this can be
@@ -1059,6 +1060,7 @@ func (WebhookBuildType) Values() []WebhookBuildType {
 	return []WebhookBuildType{
 		"BUILD",
 		"BUILD_BATCH",
+		"RUNNER_BUILDKITE_BUILD",
 	}
 }
 
diff --git a/service/codebuild/types/types.go b/service/codebuild/types/types.go
index 6708e9a2a17..f1c0f7e6c03 100644
--- a/service/codebuild/types/types.go
+++ b/service/codebuild/types/types.go
@@ -2802,6 +2802,9 @@ type WebhookFilter struct {
 	//
 	// Works with WORKFLOW_JOB_QUEUED events only.
 	//
+	// For CodeBuild-hosted Buildkite runner builds, WORKFLOW_NAME filters will filter
+	//   by pipeline name.
+	//
 	// This member is required.
 	Type WebhookFilterType
 
diff --git a/service/codecatalyst/CHANGELOG.md b/service/codecatalyst/CHANGELOG.md
index 891223a0ee4..8a6f2308176 100644
--- a/service/codecatalyst/CHANGELOG.md
+++ b/service/codecatalyst/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.17.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codecatalyst/go.mod b/service/codecatalyst/go.mod
index af1a7afeabc..5a99c4676ec 100644
--- a/service/codecatalyst/go.mod
+++ b/service/codecatalyst/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codecatalyst
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codecatalyst/go_module_metadata.go b/service/codecatalyst/go_module_metadata.go
index 40b751b8949..e45c0552367 100644
--- a/service/codecatalyst/go_module_metadata.go
+++ b/service/codecatalyst/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codecatalyst
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.13"
+const goModuleVersion = "1.17.14"
diff --git a/service/codecommit/CHANGELOG.md b/service/codecommit/CHANGELOG.md
index 9955f36c19a..3f9165f1033 100644
--- a/service/codecommit/CHANGELOG.md
+++ b/service/codecommit/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codecommit/go.mod b/service/codecommit/go.mod
index a280aca8103..f531c112aab 100644
--- a/service/codecommit/go.mod
+++ b/service/codecommit/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codecommit
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codecommit/go_module_metadata.go b/service/codecommit/go_module_metadata.go
index bc23346b8ea..d7266f33832 100644
--- a/service/codecommit/go_module_metadata.go
+++ b/service/codecommit/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codecommit
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/codeconnections/CHANGELOG.md b/service/codeconnections/CHANGELOG.md
index 18f9df2d35b..114a7ff190b 100644
--- a/service/codeconnections/CHANGELOG.md
+++ b/service/codeconnections/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.5.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.5.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codeconnections/go.mod b/service/codeconnections/go.mod
index d4c54a4949c..71e2b8f16b3 100644
--- a/service/codeconnections/go.mod
+++ b/service/codeconnections/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codeconnections
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codeconnections/go_module_metadata.go b/service/codeconnections/go_module_metadata.go
index 561a74ce969..f1e95e2f3df 100644
--- a/service/codeconnections/go_module_metadata.go
+++ b/service/codeconnections/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codeconnections
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.5.13"
+const goModuleVersion = "1.5.14"
diff --git a/service/codedeploy/CHANGELOG.md b/service/codedeploy/CHANGELOG.md
index 1ed0c2ca91f..d301a168da2 100644
--- a/service/codedeploy/CHANGELOG.md
+++ b/service/codedeploy/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.29.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codedeploy/api_op_GetDeployment.go b/service/codedeploy/api_op_GetDeployment.go
index 8b0ab096a29..2e912cd6bd0 100644
--- a/service/codedeploy/api_op_GetDeployment.go
+++ b/service/codedeploy/api_op_GetDeployment.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -321,52 +320,46 @@ func (w *DeploymentSuccessfulWaiter) WaitForOutput(ctx context.Context, params *
 func deploymentSuccessfulStateRetryable(ctx context.Context, input *GetDeploymentInput, output *GetDeploymentOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("deploymentInfo.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DeploymentInfo
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Succeeded"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("deploymentInfo.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DeploymentInfo
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("deploymentInfo.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DeploymentInfo
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Stopped"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/codedeploy/generated.json b/service/codedeploy/generated.json
index 41daac14209..86ecc3723d7 100644
--- a/service/codedeploy/generated.json
+++ b/service/codedeploy/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/codedeploy/go.mod b/service/codedeploy/go.mod
index 5b986616660..978fdc76f64 100644
--- a/service/codedeploy/go.mod
+++ b/service/codedeploy/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/codedeploy
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/codedeploy/go.sum b/service/codedeploy/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/codedeploy/go.sum
+++ b/service/codedeploy/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/codedeploy/go_module_metadata.go b/service/codedeploy/go_module_metadata.go
index 8a034c880d6..b4c7fe64130 100644
--- a/service/codedeploy/go_module_metadata.go
+++ b/service/codedeploy/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codedeploy
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.15"
+const goModuleVersion = "1.29.16"
diff --git a/service/codeguruprofiler/CHANGELOG.md b/service/codeguruprofiler/CHANGELOG.md
index f060c1b255a..a71ea467aeb 100644
--- a/service/codeguruprofiler/CHANGELOG.md
+++ b/service/codeguruprofiler/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codeguruprofiler/go.mod b/service/codeguruprofiler/go.mod
index 2b51fcec5f8..619150ec9a8 100644
--- a/service/codeguruprofiler/go.mod
+++ b/service/codeguruprofiler/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codeguruprofiler
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codeguruprofiler/go_module_metadata.go b/service/codeguruprofiler/go_module_metadata.go
index 26b6e021235..a0a90cf07e5 100644
--- a/service/codeguruprofiler/go_module_metadata.go
+++ b/service/codeguruprofiler/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codeguruprofiler
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/codegurureviewer/CHANGELOG.md b/service/codegurureviewer/CHANGELOG.md
index f007e02c246..d2c8d7ee7a9 100644
--- a/service/codegurureviewer/CHANGELOG.md
+++ b/service/codegurureviewer/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.29.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codegurureviewer/api_op_DescribeCodeReview.go b/service/codegurureviewer/api_op_DescribeCodeReview.go
index 08130bd1519..4a2c9ebbe0d 100644
--- a/service/codegurureviewer/api_op_DescribeCodeReview.go
+++ b/service/codegurureviewer/api_op_DescribeCodeReview.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -316,52 +315,46 @@ func (w *CodeReviewCompletedWaiter) WaitForOutput(ctx context.Context, params *D
 func codeReviewCompletedStateRetryable(ctx context.Context, input *DescribeCodeReviewInput, output *DescribeCodeReviewOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CodeReview.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CodeReview
+		var v2 types.JobState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.JobState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CodeReview.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CodeReview
+		var v2 types.JobState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.JobState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CodeReview.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CodeReview
+		var v2 types.JobState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Pending"
-		value, ok := pathValue.(types.JobState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go
index 0ec66766964..a261ae2c1c0 100644
--- a/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go
+++ b/service/codegurureviewer/api_op_DescribeRepositoryAssociation.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -335,52 +334,46 @@ func (w *RepositoryAssociationSucceededWaiter) WaitForOutput(ctx context.Context
 func repositoryAssociationSucceededStateRetryable(ctx context.Context, input *DescribeRepositoryAssociationInput, output *DescribeRepositoryAssociationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RepositoryAssociation.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RepositoryAssociation
+		var v2 types.RepositoryAssociationState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Associated"
-		value, ok := pathValue.(types.RepositoryAssociationState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RepositoryAssociationState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RepositoryAssociation.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RepositoryAssociation
+		var v2 types.RepositoryAssociationState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.RepositoryAssociationState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RepositoryAssociationState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RepositoryAssociation.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RepositoryAssociation
+		var v2 types.RepositoryAssociationState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Associating"
-		value, ok := pathValue.(types.RepositoryAssociationState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RepositoryAssociationState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/codegurureviewer/generated.json b/service/codegurureviewer/generated.json
index 192cedd1ed5..0a9b1c7f512 100644
--- a/service/codegurureviewer/generated.json
+++ b/service/codegurureviewer/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/codegurureviewer/go.mod b/service/codegurureviewer/go.mod
index b51ab2cb2ae..f197d107619 100644
--- a/service/codegurureviewer/go.mod
+++ b/service/codegurureviewer/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/codegurureviewer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/codegurureviewer/go.sum b/service/codegurureviewer/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/codegurureviewer/go.sum
+++ b/service/codegurureviewer/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/codegurureviewer/go_module_metadata.go b/service/codegurureviewer/go_module_metadata.go
index 180d1c65468..5134b1dde5f 100644
--- a/service/codegurureviewer/go_module_metadata.go
+++ b/service/codegurureviewer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codegurureviewer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.14"
+const goModuleVersion = "1.29.15"
diff --git a/service/codegurusecurity/CHANGELOG.md b/service/codegurusecurity/CHANGELOG.md
index 9b0eab4aebc..2a6befc60f5 100644
--- a/service/codegurusecurity/CHANGELOG.md
+++ b/service/codegurusecurity/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.12.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.12.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codegurusecurity/go.mod b/service/codegurusecurity/go.mod
index b4e9ab9ba30..455b3d68273 100644
--- a/service/codegurusecurity/go.mod
+++ b/service/codegurusecurity/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codegurusecurity
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codegurusecurity/go_module_metadata.go b/service/codegurusecurity/go_module_metadata.go
index 56f95ea6792..1297eb656f2 100644
--- a/service/codegurusecurity/go_module_metadata.go
+++ b/service/codegurusecurity/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codegurusecurity
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.12.13"
+const goModuleVersion = "1.12.14"
diff --git a/service/codepipeline/CHANGELOG.md b/service/codepipeline/CHANGELOG.md
index 67be00f7faf..1a0cb1c83b6 100644
--- a/service/codepipeline/CHANGELOG.md
+++ b/service/codepipeline/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.38.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.38.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codepipeline/go.mod b/service/codepipeline/go.mod
index d44ae940ed0..583193783c2 100644
--- a/service/codepipeline/go.mod
+++ b/service/codepipeline/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codepipeline
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codepipeline/go_module_metadata.go b/service/codepipeline/go_module_metadata.go
index 1649f675c4b..17ffab7ea43 100644
--- a/service/codepipeline/go_module_metadata.go
+++ b/service/codepipeline/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codepipeline
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.38.6"
+const goModuleVersion = "1.38.7"
diff --git a/service/codestarconnections/CHANGELOG.md b/service/codestarconnections/CHANGELOG.md
index a5dd2ed11a1..b7b41cdd9e0 100644
--- a/service/codestarconnections/CHANGELOG.md
+++ b/service/codestarconnections/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codestarconnections/go.mod b/service/codestarconnections/go.mod
index 4161e8659c1..e45ee1f09be 100644
--- a/service/codestarconnections/go.mod
+++ b/service/codestarconnections/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codestarconnections
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codestarconnections/go_module_metadata.go b/service/codestarconnections/go_module_metadata.go
index a497a5440cf..afdb110ada8 100644
--- a/service/codestarconnections/go_module_metadata.go
+++ b/service/codestarconnections/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codestarconnections
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/codestarnotifications/CHANGELOG.md b/service/codestarnotifications/CHANGELOG.md
index 146875e0189..ee7a032e789 100644
--- a/service/codestarnotifications/CHANGELOG.md
+++ b/service/codestarnotifications/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/codestarnotifications/go.mod b/service/codestarnotifications/go.mod
index 3872930be05..adee827beb4 100644
--- a/service/codestarnotifications/go.mod
+++ b/service/codestarnotifications/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/codestarnotifications
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/codestarnotifications/go_module_metadata.go b/service/codestarnotifications/go_module_metadata.go
index d38098be958..d0a6a75fe9f 100644
--- a/service/codestarnotifications/go_module_metadata.go
+++ b/service/codestarnotifications/go_module_metadata.go
@@ -3,4 +3,4 @@
 package codestarnotifications
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/cognitoidentity/CHANGELOG.md b/service/cognitoidentity/CHANGELOG.md
index 969df4d3378..cad17309888 100644
--- a/service/cognitoidentity/CHANGELOG.md
+++ b/service/cognitoidentity/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cognitoidentity/go.mod b/service/cognitoidentity/go.mod
index 0126ef4a3b4..9abce78b9de 100644
--- a/service/cognitoidentity/go.mod
+++ b/service/cognitoidentity/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cognitoidentity
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cognitoidentity/go_module_metadata.go b/service/cognitoidentity/go_module_metadata.go
index 865035ab27e..691a5932067 100644
--- a/service/cognitoidentity/go_module_metadata.go
+++ b/service/cognitoidentity/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cognitoidentity
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.3"
+const goModuleVersion = "1.28.4"
diff --git a/service/cognitoidentityprovider/CHANGELOG.md b/service/cognitoidentityprovider/CHANGELOG.md
index 3181f03aac2..8e55306efe3 100644
--- a/service/cognitoidentityprovider/CHANGELOG.md
+++ b/service/cognitoidentityprovider/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.49.3 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.49.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cognitoidentityprovider/go.mod b/service/cognitoidentityprovider/go.mod
index 090ad0b10a1..6a284e7a056 100644
--- a/service/cognitoidentityprovider/go.mod
+++ b/service/cognitoidentityprovider/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cognitoidentityprovider/go_module_metadata.go b/service/cognitoidentityprovider/go_module_metadata.go
index e51a9e4dbd6..709f9afefa0 100644
--- a/service/cognitoidentityprovider/go_module_metadata.go
+++ b/service/cognitoidentityprovider/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cognitoidentityprovider
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.49.2"
+const goModuleVersion = "1.49.3"
diff --git a/service/cognitosync/CHANGELOG.md b/service/cognitosync/CHANGELOG.md
index b9885c072c1..f37bc177b73 100644
--- a/service/cognitosync/CHANGELOG.md
+++ b/service/cognitosync/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/cognitosync/go.mod b/service/cognitosync/go.mod
index 0ad30b66218..0d2f1d9c400 100644
--- a/service/cognitosync/go.mod
+++ b/service/cognitosync/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/cognitosync
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/cognitosync/go_module_metadata.go b/service/cognitosync/go_module_metadata.go
index f70a7e5758c..0704941ae2a 100644
--- a/service/cognitosync/go_module_metadata.go
+++ b/service/cognitosync/go_module_metadata.go
@@ -3,4 +3,4 @@
 package cognitosync
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/comprehend/CHANGELOG.md b/service/comprehend/CHANGELOG.md
index 2fef924f18e..763e0bd14d7 100644
--- a/service/comprehend/CHANGELOG.md
+++ b/service/comprehend/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.35.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.35.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/comprehend/go.mod b/service/comprehend/go.mod
index df62961cfdb..2b32097c2b8 100644
--- a/service/comprehend/go.mod
+++ b/service/comprehend/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/comprehend
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/comprehend/go_module_metadata.go b/service/comprehend/go_module_metadata.go
index dfef01f9ee3..089ac4f894e 100644
--- a/service/comprehend/go_module_metadata.go
+++ b/service/comprehend/go_module_metadata.go
@@ -3,4 +3,4 @@
 package comprehend
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.35.14"
+const goModuleVersion = "1.35.15"
diff --git a/service/comprehendmedical/CHANGELOG.md b/service/comprehendmedical/CHANGELOG.md
index 9b3e02517e4..dfe7798630a 100644
--- a/service/comprehendmedical/CHANGELOG.md
+++ b/service/comprehendmedical/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/comprehendmedical/go.mod b/service/comprehendmedical/go.mod
index 7cc674d21ec..e23b62153a6 100644
--- a/service/comprehendmedical/go.mod
+++ b/service/comprehendmedical/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/comprehendmedical
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/comprehendmedical/go_module_metadata.go b/service/comprehendmedical/go_module_metadata.go
index 44824ad02d5..ffff9b1d8bd 100644
--- a/service/comprehendmedical/go_module_metadata.go
+++ b/service/comprehendmedical/go_module_metadata.go
@@ -3,4 +3,4 @@
 package comprehendmedical
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/computeoptimizer/CHANGELOG.md b/service/computeoptimizer/CHANGELOG.md
index c71537a52b9..a4247177644 100644
--- a/service/computeoptimizer/CHANGELOG.md
+++ b/service/computeoptimizer/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.41.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.41.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/computeoptimizer/go.mod b/service/computeoptimizer/go.mod
index 7b043ae4e76..c31a5a254e9 100644
--- a/service/computeoptimizer/go.mod
+++ b/service/computeoptimizer/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/computeoptimizer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/computeoptimizer/go_module_metadata.go b/service/computeoptimizer/go_module_metadata.go
index 0776b27cb77..fe20ebc4d96 100644
--- a/service/computeoptimizer/go_module_metadata.go
+++ b/service/computeoptimizer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package computeoptimizer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.41.4"
+const goModuleVersion = "1.41.5"
diff --git a/service/configservice/CHANGELOG.md b/service/configservice/CHANGELOG.md
index 560ea84e4e6..70d27cca62e 100644
--- a/service/configservice/CHANGELOG.md
+++ b/service/configservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.51.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.51.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/configservice/go.mod b/service/configservice/go.mod
index 0a4397d96f9..b245007dd70 100644
--- a/service/configservice/go.mod
+++ b/service/configservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/configservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/configservice/go_module_metadata.go b/service/configservice/go_module_metadata.go
index 1895847811b..16a651192fc 100644
--- a/service/configservice/go_module_metadata.go
+++ b/service/configservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package configservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.51.9"
+const goModuleVersion = "1.51.10"
diff --git a/service/connect/CHANGELOG.md b/service/connect/CHANGELOG.md
index 8e6a0207867..abd2235611c 100644
--- a/service/connect/CHANGELOG.md
+++ b/service/connect/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.124.3 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.124.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connect/go.mod b/service/connect/go.mod
index 47db09e6531..2160230d383 100644
--- a/service/connect/go.mod
+++ b/service/connect/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connect/go_module_metadata.go b/service/connect/go_module_metadata.go
index f4708c12ec4..655b8ec1b5c 100644
--- a/service/connect/go_module_metadata.go
+++ b/service/connect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.124.2"
+const goModuleVersion = "1.124.3"
diff --git a/service/connectcampaigns/CHANGELOG.md b/service/connectcampaigns/CHANGELOG.md
index f5d05410d65..f47f2186c37 100644
--- a/service/connectcampaigns/CHANGELOG.md
+++ b/service/connectcampaigns/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.15.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.15.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connectcampaigns/go.mod b/service/connectcampaigns/go.mod
index 88ae0072112..9e3f7c70b2c 100644
--- a/service/connectcampaigns/go.mod
+++ b/service/connectcampaigns/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connectcampaigns
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connectcampaigns/go_module_metadata.go b/service/connectcampaigns/go_module_metadata.go
index 3394a0e33ee..fed67c4c9fb 100644
--- a/service/connectcampaigns/go_module_metadata.go
+++ b/service/connectcampaigns/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connectcampaigns
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.15.14"
+const goModuleVersion = "1.15.15"
diff --git a/service/connectcampaignsv2/CHANGELOG.md b/service/connectcampaignsv2/CHANGELOG.md
index ac250d4506b..fe6bfd08a71 100644
--- a/service/connectcampaignsv2/CHANGELOG.md
+++ b/service/connectcampaignsv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connectcampaignsv2/go.mod b/service/connectcampaignsv2/go.mod
index 5e6a1a1d76b..813778d3cb9 100644
--- a/service/connectcampaignsv2/go.mod
+++ b/service/connectcampaignsv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connectcampaignsv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connectcampaignsv2/go_module_metadata.go b/service/connectcampaignsv2/go_module_metadata.go
index 7f466962eda..57646309e91 100644
--- a/service/connectcampaignsv2/go_module_metadata.go
+++ b/service/connectcampaignsv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connectcampaignsv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.6"
+const goModuleVersion = "1.1.7"
diff --git a/service/connectcases/CHANGELOG.md b/service/connectcases/CHANGELOG.md
index aa7f4431ccd..46cd5fcdafa 100644
--- a/service/connectcases/CHANGELOG.md
+++ b/service/connectcases/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connectcases/go.mod b/service/connectcases/go.mod
index f0b92272ba4..a2cbdc9693f 100644
--- a/service/connectcases/go.mod
+++ b/service/connectcases/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connectcases
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connectcases/go_module_metadata.go b/service/connectcases/go_module_metadata.go
index cd8df90fbb4..d9524713e49 100644
--- a/service/connectcases/go_module_metadata.go
+++ b/service/connectcases/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connectcases
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.13"
+const goModuleVersion = "1.21.14"
diff --git a/service/connectcontactlens/CHANGELOG.md b/service/connectcontactlens/CHANGELOG.md
index 2fd66e00dbc..3661cff75e9 100644
--- a/service/connectcontactlens/CHANGELOG.md
+++ b/service/connectcontactlens/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connectcontactlens/go.mod b/service/connectcontactlens/go.mod
index 0546f7f2e17..0efa6a82322 100644
--- a/service/connectcontactlens/go.mod
+++ b/service/connectcontactlens/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connectcontactlens
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connectcontactlens/go_module_metadata.go b/service/connectcontactlens/go_module_metadata.go
index 4b377ebd1c8..049e4030971 100644
--- a/service/connectcontactlens/go_module_metadata.go
+++ b/service/connectcontactlens/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connectcontactlens
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/connectparticipant/CHANGELOG.md b/service/connectparticipant/CHANGELOG.md
index 97a97d7fd68..c91fd554a52 100644
--- a/service/connectparticipant/CHANGELOG.md
+++ b/service/connectparticipant/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/connectparticipant/go.mod b/service/connectparticipant/go.mod
index 46092c53f4d..feb59b402d2 100644
--- a/service/connectparticipant/go.mod
+++ b/service/connectparticipant/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/connectparticipant
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/connectparticipant/go_module_metadata.go b/service/connectparticipant/go_module_metadata.go
index beb1e39870e..0e74974c126 100644
--- a/service/connectparticipant/go_module_metadata.go
+++ b/service/connectparticipant/go_module_metadata.go
@@ -3,4 +3,4 @@
 package connectparticipant
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.6"
+const goModuleVersion = "1.28.7"
diff --git a/service/controlcatalog/CHANGELOG.md b/service/controlcatalog/CHANGELOG.md
index c99718df211..67a073d97b4 100644
--- a/service/controlcatalog/CHANGELOG.md
+++ b/service/controlcatalog/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.6.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.6.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/controlcatalog/go.mod b/service/controlcatalog/go.mod
index bfd190302db..694b419161c 100644
--- a/service/controlcatalog/go.mod
+++ b/service/controlcatalog/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/controlcatalog
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/controlcatalog/go_module_metadata.go b/service/controlcatalog/go_module_metadata.go
index f0eee998a54..7647a067f9c 100644
--- a/service/controlcatalog/go_module_metadata.go
+++ b/service/controlcatalog/go_module_metadata.go
@@ -3,4 +3,4 @@
 package controlcatalog
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.6.9"
+const goModuleVersion = "1.6.10"
diff --git a/service/controltower/CHANGELOG.md b/service/controltower/CHANGELOG.md
index 656f4922028..8a4d05b7fa0 100644
--- a/service/controltower/CHANGELOG.md
+++ b/service/controltower/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/controltower/go.mod b/service/controltower/go.mod
index 76868d73a47..aa9007c5afc 100644
--- a/service/controltower/go.mod
+++ b/service/controltower/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/controltower
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/controltower/go_module_metadata.go b/service/controltower/go_module_metadata.go
index 2b81a4a6c71..904a041c52e 100644
--- a/service/controltower/go_module_metadata.go
+++ b/service/controltower/go_module_metadata.go
@@ -3,4 +3,4 @@
 package controltower
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.7"
+const goModuleVersion = "1.20.8"
diff --git a/service/costandusagereportservice/CHANGELOG.md b/service/costandusagereportservice/CHANGELOG.md
index 87c7d39b8a5..a1896f91a37 100644
--- a/service/costandusagereportservice/CHANGELOG.md
+++ b/service/costandusagereportservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/costandusagereportservice/go.mod b/service/costandusagereportservice/go.mod
index 85b60213ae0..410f0506252 100644
--- a/service/costandusagereportservice/go.mod
+++ b/service/costandusagereportservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/costandusagereportservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/costandusagereportservice/go_module_metadata.go b/service/costandusagereportservice/go_module_metadata.go
index c513929bb97..ca2e26cd0cd 100644
--- a/service/costandusagereportservice/go_module_metadata.go
+++ b/service/costandusagereportservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package costandusagereportservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/costexplorer/CHANGELOG.md b/service/costexplorer/CHANGELOG.md
index ffe706ee57e..01b67c3c680 100644
--- a/service/costexplorer/CHANGELOG.md
+++ b/service/costexplorer/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.46.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.46.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/costexplorer/go.mod b/service/costexplorer/go.mod
index 37bb264e260..3997cceaae0 100644
--- a/service/costexplorer/go.mod
+++ b/service/costexplorer/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/costexplorer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/costexplorer/go_module_metadata.go b/service/costexplorer/go_module_metadata.go
index e6382157273..58469fb78ce 100644
--- a/service/costexplorer/go_module_metadata.go
+++ b/service/costexplorer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package costexplorer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.46.5"
+const goModuleVersion = "1.46.6"
diff --git a/service/costoptimizationhub/CHANGELOG.md b/service/costoptimizationhub/CHANGELOG.md
index ac56ee992d2..e40b75cb408 100644
--- a/service/costoptimizationhub/CHANGELOG.md
+++ b/service/costoptimizationhub/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/costoptimizationhub/go.mod b/service/costoptimizationhub/go.mod
index f40fb91fde3..9635e8414db 100644
--- a/service/costoptimizationhub/go.mod
+++ b/service/costoptimizationhub/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/costoptimizationhub
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/costoptimizationhub/go_module_metadata.go b/service/costoptimizationhub/go_module_metadata.go
index ca0527bda8b..042f39619db 100644
--- a/service/costoptimizationhub/go_module_metadata.go
+++ b/service/costoptimizationhub/go_module_metadata.go
@@ -3,4 +3,4 @@
 package costoptimizationhub
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.7"
+const goModuleVersion = "1.11.8"
diff --git a/service/customerprofiles/CHANGELOG.md b/service/customerprofiles/CHANGELOG.md
index c46abf03b7f..da6c2c7bb1b 100644
--- a/service/customerprofiles/CHANGELOG.md
+++ b/service/customerprofiles/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.44.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.44.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/customerprofiles/go.mod b/service/customerprofiles/go.mod
index 5c304e41b12..152c9773782 100644
--- a/service/customerprofiles/go.mod
+++ b/service/customerprofiles/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/customerprofiles
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/customerprofiles/go_module_metadata.go b/service/customerprofiles/go_module_metadata.go
index d7d36e533de..9f10758ae70 100644
--- a/service/customerprofiles/go_module_metadata.go
+++ b/service/customerprofiles/go_module_metadata.go
@@ -3,4 +3,4 @@
 package customerprofiles
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.6"
+const goModuleVersion = "1.44.7"
diff --git a/service/databasemigrationservice/CHANGELOG.md b/service/databasemigrationservice/CHANGELOG.md
index 096994de63e..a8c39313d49 100644
--- a/service/databasemigrationservice/CHANGELOG.md
+++ b/service/databasemigrationservice/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.45.9 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/databasemigrationservice/api_op_DescribeConnections.go b/service/databasemigrationservice/api_op_DescribeConnections.go
index 6a94f4c32b3..4b75a7e4262 100644
--- a/service/databasemigrationservice/api_op_DescribeConnections.go
+++ b/service/databasemigrationservice/api_op_DescribeConnections.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -335,29 +334,20 @@ func (w *TestConnectionSucceedsWaiter) WaitForOutput(ctx context.Context, params
 func testConnectionSucceedsStateRetryable(ctx context.Context, input *DescribeConnectionsInput, output *DescribeConnectionsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Connections[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Connections
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "successful"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -367,26 +357,25 @@ func testConnectionSucceedsStateRetryable(ctx context.Context, input *DescribeCo
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Connections[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Connections
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/databasemigrationservice/api_op_DescribeEndpoints.go b/service/databasemigrationservice/api_op_DescribeEndpoints.go
index a27afc326da..ac0ec14bcb1 100644
--- a/service/databasemigrationservice/api_op_DescribeEndpoints.go
+++ b/service/databasemigrationservice/api_op_DescribeEndpoints.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -339,50 +338,48 @@ func endpointDeletedStateRetryable(ctx context.Context, input *DescribeEndpoints
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Endpoints[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Endpoints
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "active"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Endpoints[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Endpoints
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go
index a095ffb5e47..cee36ec4dbe 100644
--- a/service/databasemigrationservice/api_op_DescribeReplicationInstances.go
+++ b/service/databasemigrationservice/api_op_DescribeReplicationInstances.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -338,29 +337,20 @@ func (w *ReplicationInstanceAvailableWaiter) WaitForOutput(ctx context.Context,
 func replicationInstanceAvailableStateRetryable(ctx context.Context, input *DescribeReplicationInstancesInput, output *DescribeReplicationInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -370,98 +360,94 @@ func replicationInstanceAvailableStateRetryable(ctx context.Context, input *Desc
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-network"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "inaccessible-encryption-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -635,26 +621,25 @@ func (w *ReplicationInstanceDeletedWaiter) WaitForOutput(ctx context.Context, pa
 func replicationInstanceDeletedStateRetryable(ctx context.Context, input *DescribeReplicationInstancesInput, output *DescribeReplicationInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationInstances[].ReplicationInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ReplicationInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go
index b37ec5ea3b3..5227d599160 100644
--- a/service/databasemigrationservice/api_op_DescribeReplicationTasks.go
+++ b/service/databasemigrationservice/api_op_DescribeReplicationTasks.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -341,122 +340,117 @@ func (w *ReplicationTaskDeletedWaiter) WaitForOutput(ctx context.Context, params
 func replicationTaskDeletedStateRetryable(ctx context.Context, input *DescribeReplicationTasksInput, output *DescribeReplicationTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "ready"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "running"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -635,29 +629,20 @@ func (w *ReplicationTaskReadyWaiter) WaitForOutput(ctx context.Context, params *
 func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeReplicationTasksInput, output *DescribeReplicationTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "ready"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -667,194 +652,186 @@ func replicationTaskReadyStateRetryable(ctx context.Context, input *DescribeRepl
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "starting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "running"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopping"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "testing"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1026,29 +1003,20 @@ func (w *ReplicationTaskRunningWaiter) WaitForOutput(ctx context.Context, params
 func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeReplicationTasksInput, output *DescribeReplicationTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "running"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1058,194 +1026,186 @@ func replicationTaskRunningStateRetryable(ctx context.Context, input *DescribeRe
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "ready"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopping"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "testing"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1417,29 +1377,20 @@ func (w *ReplicationTaskStoppedWaiter) WaitForOutput(ctx context.Context, params
 func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeReplicationTasksInput, output *DescribeReplicationTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1449,170 +1400,163 @@ func replicationTaskStoppedStateRetryable(ctx context.Context, input *DescribeRe
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "ready"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "starting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "testing"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationTasks[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationTasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/databasemigrationservice/generated.json b/service/databasemigrationservice/generated.json
index 50976783d90..dac73026073 100644
--- a/service/databasemigrationservice/generated.json
+++ b/service/databasemigrationservice/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/databasemigrationservice/go.mod b/service/databasemigrationservice/go.mod
index be6694aa40a..ba34d21bb26 100644
--- a/service/databasemigrationservice/go.mod
+++ b/service/databasemigrationservice/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/databasemigrationservice/go.sum b/service/databasemigrationservice/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/databasemigrationservice/go.sum
+++ b/service/databasemigrationservice/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/databasemigrationservice/go_module_metadata.go b/service/databasemigrationservice/go_module_metadata.go
index eca0c3e17bc..1939cc7fd78 100644
--- a/service/databasemigrationservice/go_module_metadata.go
+++ b/service/databasemigrationservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package databasemigrationservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.8"
+const goModuleVersion = "1.45.9"
diff --git a/service/databrew/CHANGELOG.md b/service/databrew/CHANGELOG.md
index b087016ed13..97cca03fd0d 100644
--- a/service/databrew/CHANGELOG.md
+++ b/service/databrew/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/databrew/go.mod b/service/databrew/go.mod
index 54441b3c73a..6b27dd2edd8 100644
--- a/service/databrew/go.mod
+++ b/service/databrew/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/databrew
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/databrew/go_module_metadata.go b/service/databrew/go_module_metadata.go
index 3a1d34028a2..1cb3b7430d2 100644
--- a/service/databrew/go_module_metadata.go
+++ b/service/databrew/go_module_metadata.go
@@ -3,4 +3,4 @@
 package databrew
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.13"
+const goModuleVersion = "1.33.14"
diff --git a/service/dataexchange/CHANGELOG.md b/service/dataexchange/CHANGELOG.md
index 06f6f0bf1ff..35887718994 100644
--- a/service/dataexchange/CHANGELOG.md
+++ b/service/dataexchange/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dataexchange/go.mod b/service/dataexchange/go.mod
index bf906ec639b..0fac7be70f0 100644
--- a/service/dataexchange/go.mod
+++ b/service/dataexchange/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/dataexchange
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/dataexchange/go_module_metadata.go b/service/dataexchange/go_module_metadata.go
index d7d821ea5ce..5cb7a5a913c 100644
--- a/service/dataexchange/go_module_metadata.go
+++ b/service/dataexchange/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dataexchange
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.11"
+const goModuleVersion = "1.33.12"
diff --git a/service/datapipeline/CHANGELOG.md b/service/datapipeline/CHANGELOG.md
index bc236fd11db..d30bf8e0f70 100644
--- a/service/datapipeline/CHANGELOG.md
+++ b/service/datapipeline/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/datapipeline/go.mod b/service/datapipeline/go.mod
index 35a81c5ca05..a15987dc374 100644
--- a/service/datapipeline/go.mod
+++ b/service/datapipeline/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/datapipeline
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/datapipeline/go_module_metadata.go b/service/datapipeline/go_module_metadata.go
index 836aa934537..72e9b00ab07 100644
--- a/service/datapipeline/go_module_metadata.go
+++ b/service/datapipeline/go_module_metadata.go
@@ -3,4 +3,4 @@
 package datapipeline
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/datasync/CHANGELOG.md b/service/datasync/CHANGELOG.md
index 50483bfb69a..c3a68a90a41 100644
--- a/service/datasync/CHANGELOG.md
+++ b/service/datasync/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/datasync/go.mod b/service/datasync/go.mod
index a767e09a714..a0ff33a6c13 100644
--- a/service/datasync/go.mod
+++ b/service/datasync/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/datasync
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/datasync/go_module_metadata.go b/service/datasync/go_module_metadata.go
index d4d715bd515..3de3e902311 100644
--- a/service/datasync/go_module_metadata.go
+++ b/service/datasync/go_module_metadata.go
@@ -3,4 +3,4 @@
 package datasync
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.1"
+const goModuleVersion = "1.45.2"
diff --git a/service/datazone/CHANGELOG.md b/service/datazone/CHANGELOG.md
index fbb5c604643..0526775c5b6 100644
--- a/service/datazone/CHANGELOG.md
+++ b/service/datazone/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/datazone/go.mod b/service/datazone/go.mod
index d52695a898f..8577c4c6ebd 100644
--- a/service/datazone/go.mod
+++ b/service/datazone/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/datazone
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/datazone/go_module_metadata.go b/service/datazone/go_module_metadata.go
index 10b95a5ea14..9ea700238a7 100644
--- a/service/datazone/go_module_metadata.go
+++ b/service/datazone/go_module_metadata.go
@@ -3,4 +3,4 @@
 package datazone
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.7"
+const goModuleVersion = "1.25.8"
diff --git a/service/dax/CHANGELOG.md b/service/dax/CHANGELOG.md
index c557b410a5e..7f0111a6686 100644
--- a/service/dax/CHANGELOG.md
+++ b/service/dax/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dax/go.mod b/service/dax/go.mod
index 6f8d498faad..3a4085e84f3 100644
--- a/service/dax/go.mod
+++ b/service/dax/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/dax
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/dax/go_module_metadata.go b/service/dax/go_module_metadata.go
index a578307aad8..b599e3e5c41 100644
--- a/service/dax/go_module_metadata.go
+++ b/service/dax/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dax
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/deadline/CHANGELOG.md b/service/deadline/CHANGELOG.md
index bfc495e9e63..3963a4327a5 100644
--- a/service/deadline/CHANGELOG.md
+++ b/service/deadline/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.8.2 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/deadline/api_op_GetFleet.go b/service/deadline/api_op_GetFleet.go
index e4be910ad6b..2f108c849b8 100644
--- a/service/deadline/api_op_GetFleet.go
+++ b/service/deadline/api_op_GetFleet.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -398,52 +397,31 @@ func (w *FleetActiveWaiter) WaitForOutput(ctx context.Context, params *GetFleetI
 func fleetActiveStateRetryable(ctx context.Context, input *GetFleetInput, output *GetFleetOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.FleetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FleetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.FleetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FleetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATE_FAILED"
-		value, ok := pathValue.(types.FleetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FleetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/deadline/api_op_GetJob.go b/service/deadline/api_op_GetJob.go
index b7c1677b2e9..aaa7c87adc7 100644
--- a/service/deadline/api_op_GetJob.go
+++ b/service/deadline/api_op_GetJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -412,103 +411,61 @@ func (w *JobCreateCompleteWaiter) WaitForOutput(ctx context.Context, params *Get
 func jobCreateCompleteStateRetryable(ctx context.Context, input *GetJobInput, output *GetJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "CREATE_COMPLETE"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "UPDATE_IN_PROGRESS"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "UPDATE_FAILED"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "UPDATE_SUCCEEDED"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "UPLOAD_FAILED"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("lifecycleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LifecycleStatus
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.JobLifecycleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobLifecycleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/deadline/api_op_GetLicenseEndpoint.go b/service/deadline/api_op_GetLicenseEndpoint.go
index 7236e073648..8b1e247b433 100644
--- a/service/deadline/api_op_GetLicenseEndpoint.go
+++ b/service/deadline/api_op_GetLicenseEndpoint.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -342,35 +341,21 @@ func (w *LicenseEndpointValidWaiter) WaitForOutput(ctx context.Context, params *
 func licenseEndpointValidStateRetryable(ctx context.Context, input *GetLicenseEndpointInput, output *GetLicenseEndpointOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "READY"
-		value, ok := pathValue.(types.LicenseEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LicenseEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "NOT_READY"
-		value, ok := pathValue.(types.LicenseEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LicenseEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -550,18 +535,11 @@ func licenseEndpointDeletedStateRetryable(ctx context.Context, input *GetLicense
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "NOT_READY"
-		value, ok := pathValue.(types.LicenseEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LicenseEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/deadline/api_op_GetQueue.go b/service/deadline/api_op_GetQueue.go
index 529d8b0b787..2d926dc0c3f 100644
--- a/service/deadline/api_op_GetQueue.go
+++ b/service/deadline/api_op_GetQueue.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -395,18 +394,11 @@ func (w *QueueSchedulingBlockedWaiter) WaitForOutput(ctx context.Context, params
 func queueSchedulingBlockedStateRetryable(ctx context.Context, input *GetQueueInput, output *GetQueueOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SCHEDULING_BLOCKED"
-		value, ok := pathValue.(types.QueueStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.QueueStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -577,18 +569,11 @@ func (w *QueueSchedulingWaiter) WaitForOutput(ctx context.Context, params *GetQu
 func queueSchedulingStateRetryable(ctx context.Context, input *GetQueueInput, output *GetQueueOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SCHEDULING"
-		value, ok := pathValue.(types.QueueStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.QueueStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/deadline/api_op_GetQueueFleetAssociation.go b/service/deadline/api_op_GetQueueFleetAssociation.go
index c2a9eda5ae1..d0d2af74658 100644
--- a/service/deadline/api_op_GetQueueFleetAssociation.go
+++ b/service/deadline/api_op_GetQueueFleetAssociation.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,18 +356,11 @@ func (w *QueueFleetAssociationStoppedWaiter) WaitForOutput(ctx context.Context,
 func queueFleetAssociationStoppedStateRetryable(ctx context.Context, input *GetQueueFleetAssociationInput, output *GetQueueFleetAssociationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STOPPED"
-		value, ok := pathValue.(types.QueueFleetAssociationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.QueueFleetAssociationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/deadline/api_op_GetQueueLimitAssociation.go b/service/deadline/api_op_GetQueueLimitAssociation.go
index eccdce8c0dd..972100965c0 100644
--- a/service/deadline/api_op_GetQueueLimitAssociation.go
+++ b/service/deadline/api_op_GetQueueLimitAssociation.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,18 +356,11 @@ func (w *QueueLimitAssociationStoppedWaiter) WaitForOutput(ctx context.Context,
 func queueLimitAssociationStoppedStateRetryable(ctx context.Context, input *GetQueueLimitAssociationInput, output *GetQueueLimitAssociationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STOPPED"
-		value, ok := pathValue.(types.QueueLimitAssociationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.QueueLimitAssociationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/deadline/generated.json b/service/deadline/generated.json
index b5337c588ed..a7da61d03f2 100644
--- a/service/deadline/generated.json
+++ b/service/deadline/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/deadline/go.mod b/service/deadline/go.mod
index 257ecdd435a..6a7ecf74a78 100644
--- a/service/deadline/go.mod
+++ b/service/deadline/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/deadline
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/deadline/go.sum b/service/deadline/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/deadline/go.sum
+++ b/service/deadline/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/deadline/go_module_metadata.go b/service/deadline/go_module_metadata.go
index 0d16614ac1d..b57e15e7255 100644
--- a/service/deadline/go_module_metadata.go
+++ b/service/deadline/go_module_metadata.go
@@ -3,4 +3,4 @@
 package deadline
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.1"
+const goModuleVersion = "1.8.2"
diff --git a/service/detective/CHANGELOG.md b/service/detective/CHANGELOG.md
index ff3ba0abd99..c8c8368e5e1 100644
--- a/service/detective/CHANGELOG.md
+++ b/service/detective/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/detective/go.mod b/service/detective/go.mod
index c9a7a208c60..f263525e9e5 100644
--- a/service/detective/go.mod
+++ b/service/detective/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/detective
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/detective/go_module_metadata.go b/service/detective/go_module_metadata.go
index 7bb9243065d..a4e04c7261e 100644
--- a/service/detective/go_module_metadata.go
+++ b/service/detective/go_module_metadata.go
@@ -3,4 +3,4 @@
 package detective
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.13"
+const goModuleVersion = "1.31.14"
diff --git a/service/devicefarm/CHANGELOG.md b/service/devicefarm/CHANGELOG.md
index 79f9b696df9..ac00eaf426b 100644
--- a/service/devicefarm/CHANGELOG.md
+++ b/service/devicefarm/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/devicefarm/go.mod b/service/devicefarm/go.mod
index 365c9f72882..3b87035bee7 100644
--- a/service/devicefarm/go.mod
+++ b/service/devicefarm/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/devicefarm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/devicefarm/go_module_metadata.go b/service/devicefarm/go_module_metadata.go
index 32f386a5ef4..b0736e6f4d7 100644
--- a/service/devicefarm/go_module_metadata.go
+++ b/service/devicefarm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package devicefarm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/devopsguru/CHANGELOG.md b/service/devopsguru/CHANGELOG.md
index 0635ed83b6d..1f2f32d3b21 100644
--- a/service/devopsguru/CHANGELOG.md
+++ b/service/devopsguru/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/devopsguru/go.mod b/service/devopsguru/go.mod
index a992f27f8d3..32251b4b06e 100644
--- a/service/devopsguru/go.mod
+++ b/service/devopsguru/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/devopsguru
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/devopsguru/go_module_metadata.go b/service/devopsguru/go_module_metadata.go
index 5190e0b375b..ced3bfb27a9 100644
--- a/service/devopsguru/go_module_metadata.go
+++ b/service/devopsguru/go_module_metadata.go
@@ -3,4 +3,4 @@
 package devopsguru
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/directconnect/CHANGELOG.md b/service/directconnect/CHANGELOG.md
index d05482bb928..0a792b09159 100644
--- a/service/directconnect/CHANGELOG.md
+++ b/service/directconnect/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/directconnect/go.mod b/service/directconnect/go.mod
index 11dfeeacbd5..5d645fa5eca 100644
--- a/service/directconnect/go.mod
+++ b/service/directconnect/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/directconnect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/directconnect/go_module_metadata.go b/service/directconnect/go_module_metadata.go
index 3a4617dfaeb..36f143ee962 100644
--- a/service/directconnect/go_module_metadata.go
+++ b/service/directconnect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package directconnect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.9"
+const goModuleVersion = "1.30.10"
diff --git a/service/directoryservice/CHANGELOG.md b/service/directoryservice/CHANGELOG.md
index 0f2a4970de2..ef83adfa520 100644
--- a/service/directoryservice/CHANGELOG.md
+++ b/service/directoryservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/directoryservice/go.mod b/service/directoryservice/go.mod
index dd24db22653..242aa7bfde6 100644
--- a/service/directoryservice/go.mod
+++ b/service/directoryservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/directoryservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/directoryservice/go_module_metadata.go b/service/directoryservice/go_module_metadata.go
index 8fa21a78f50..b567b979c9f 100644
--- a/service/directoryservice/go_module_metadata.go
+++ b/service/directoryservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package directoryservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.14"
+const goModuleVersion = "1.30.15"
diff --git a/service/directoryservicedata/CHANGELOG.md b/service/directoryservicedata/CHANGELOG.md
index 6b88de806ca..ff46d198525 100644
--- a/service/directoryservicedata/CHANGELOG.md
+++ b/service/directoryservicedata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.2.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.2.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/directoryservicedata/go.mod b/service/directoryservicedata/go.mod
index 08c3cd2ff63..b3a0b23930c 100644
--- a/service/directoryservicedata/go.mod
+++ b/service/directoryservicedata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/directoryservicedata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/directoryservicedata/go_module_metadata.go b/service/directoryservicedata/go_module_metadata.go
index 69f5262f193..69e3024b17d 100644
--- a/service/directoryservicedata/go_module_metadata.go
+++ b/service/directoryservicedata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package directoryservicedata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.2.13"
+const goModuleVersion = "1.2.14"
diff --git a/service/dlm/CHANGELOG.md b/service/dlm/CHANGELOG.md
index 60cc8475f0e..9830e40fd9b 100644
--- a/service/dlm/CHANGELOG.md
+++ b/service/dlm/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dlm/go.mod b/service/dlm/go.mod
index d33acdb38c6..f3e4a435526 100644
--- a/service/dlm/go.mod
+++ b/service/dlm/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/dlm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/dlm/go_module_metadata.go b/service/dlm/go_module_metadata.go
index cec05a66641..5505e6b64d8 100644
--- a/service/dlm/go_module_metadata.go
+++ b/service/dlm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dlm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.8"
+const goModuleVersion = "1.29.9"
diff --git a/service/docdb/CHANGELOG.md b/service/docdb/CHANGELOG.md
index bf8a5f89dbe..5fa82d6fff4 100644
--- a/service/docdb/CHANGELOG.md
+++ b/service/docdb/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.40.8 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.40.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/docdb/api_op_DescribeDBInstances.go b/service/docdb/api_op_DescribeDBInstances.go
index 3a2f066e580..262eae25bd6 100644
--- a/service/docdb/api_op_DescribeDBInstances.go
+++ b/service/docdb/api_op_DescribeDBInstances.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -355,29 +354,20 @@ func (w *DBInstanceAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -387,122 +377,117 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -672,29 +657,20 @@ func (w *DBInstanceDeletedWaiter) WaitForOutput(ctx context.Context, params *Des
 func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -716,98 +692,94 @@ func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInsta
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/docdb/generated.json b/service/docdb/generated.json
index 63f7877f195..8c9ea47b21f 100644
--- a/service/docdb/generated.json
+++ b/service/docdb/generated.json
@@ -5,8 +5,7 @@
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5",
         "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/docdb/go.mod b/service/docdb/go.mod
index 18ea03a4cab..4ba83961ff7 100644
--- a/service/docdb/go.mod
+++ b/service/docdb/go.mod
@@ -3,13 +3,12 @@ module github.com/aws/aws-sdk-go-v2/service/docdb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/docdb/go.sum b/service/docdb/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/docdb/go.sum
+++ b/service/docdb/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/docdb/go_module_metadata.go b/service/docdb/go_module_metadata.go
index aa5f934f5ef..aa5dee306bb 100644
--- a/service/docdb/go_module_metadata.go
+++ b/service/docdb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package docdb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.40.7"
+const goModuleVersion = "1.40.8"
diff --git a/service/docdbelastic/CHANGELOG.md b/service/docdbelastic/CHANGELOG.md
index e33ba8cf85a..a61ecbb9da4 100644
--- a/service/docdbelastic/CHANGELOG.md
+++ b/service/docdbelastic/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/docdbelastic/go.mod b/service/docdbelastic/go.mod
index ad6a8c2c930..b42e33ea679 100644
--- a/service/docdbelastic/go.mod
+++ b/service/docdbelastic/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/docdbelastic
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/docdbelastic/go_module_metadata.go b/service/docdbelastic/go_module_metadata.go
index d3e69a64e7f..ff8c019ec21 100644
--- a/service/docdbelastic/go_module_metadata.go
+++ b/service/docdbelastic/go_module_metadata.go
@@ -3,4 +3,4 @@
 package docdbelastic
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.10"
+const goModuleVersion = "1.14.11"
diff --git a/service/drs/CHANGELOG.md b/service/drs/CHANGELOG.md
index 97296080eb6..22499873afc 100644
--- a/service/drs/CHANGELOG.md
+++ b/service/drs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/drs/go.mod b/service/drs/go.mod
index e2055bf8788..34fe3a18fcc 100644
--- a/service/drs/go.mod
+++ b/service/drs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/drs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/drs/go_module_metadata.go b/service/drs/go_module_metadata.go
index 0e12dc6cdb3..6283e50cf83 100644
--- a/service/drs/go_module_metadata.go
+++ b/service/drs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package drs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.13"
+const goModuleVersion = "1.30.14"
diff --git a/service/dsql/CHANGELOG.md b/service/dsql/CHANGELOG.md
index a6b128d38ec..92cde5b9653 100644
--- a/service/dsql/CHANGELOG.md
+++ b/service/dsql/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.0.8 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dsql/api_op_GetCluster.go b/service/dsql/api_op_GetCluster.go
index f2252781c1f..53f705bacf8 100644
--- a/service/dsql/api_op_GetCluster.go
+++ b/service/dsql/api_op_GetCluster.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -342,18 +341,11 @@ func (w *ClusterActiveWaiter) WaitForOutput(ctx context.Context, params *GetClus
 func clusterActiveStateRetryable(ctx context.Context, input *GetClusterInput, output *GetClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/dsql/generated.json b/service/dsql/generated.json
index b46e2dfa1f7..128dc470482 100644
--- a/service/dsql/generated.json
+++ b/service/dsql/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/dsql/go.mod b/service/dsql/go.mod
index ae5e2bab01d..054a06fd195 100644
--- a/service/dsql/go.mod
+++ b/service/dsql/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/dsql
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/dsql/go.sum b/service/dsql/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/dsql/go.sum
+++ b/service/dsql/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/dsql/go_module_metadata.go b/service/dsql/go_module_metadata.go
index f71e18bb52b..d81d232f1c8 100644
--- a/service/dsql/go_module_metadata.go
+++ b/service/dsql/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dsql
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.7"
+const goModuleVersion = "1.0.8"
diff --git a/service/dynamodb/CHANGELOG.md b/service/dynamodb/CHANGELOG.md
index a7ca5193263..f86e30a80a0 100644
--- a/service/dynamodb/CHANGELOG.md
+++ b/service/dynamodb/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.39.8 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.39.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dynamodb/api_op_DescribeTable.go b/service/dynamodb/api_op_DescribeTable.go
index a9c0049f9fc..ba453ee8879 100644
--- a/service/dynamodb/api_op_DescribeTable.go
+++ b/service/dynamodb/api_op_DescribeTable.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -335,18 +334,16 @@ func (w *TableExistsWaiter) WaitForOutput(ctx context.Context, params *DescribeT
 func tableExistsStateRetryable(ctx context.Context, input *DescribeTableInput, output *DescribeTableOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Table.TableStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Table
+		var v2 types.TableStatus
+		if v1 != nil {
+			v3 := v1.TableStatus
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.TableStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TableStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/dynamodb/generated.json b/service/dynamodb/generated.json
index 529544017eb..f055cabc750 100644
--- a/service/dynamodb/generated.json
+++ b/service/dynamodb/generated.json
@@ -5,8 +5,7 @@
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5",
         "github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery": "v0.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/dynamodb/go.mod b/service/dynamodb/go.mod
index 5a868c599c9..7551229c441 100644
--- a/service/dynamodb/go.mod
+++ b/service/dynamodb/go.mod
@@ -3,13 +3,12 @@ module github.com/aws/aws-sdk-go-v2/service/dynamodb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/dynamodb/go.sum b/service/dynamodb/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/dynamodb/go.sum
+++ b/service/dynamodb/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/dynamodb/go_module_metadata.go b/service/dynamodb/go_module_metadata.go
index 0a83f816f6a..944c19c2342 100644
--- a/service/dynamodb/go_module_metadata.go
+++ b/service/dynamodb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dynamodb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.39.7"
+const goModuleVersion = "1.39.8"
diff --git a/service/dynamodbstreams/CHANGELOG.md b/service/dynamodbstreams/CHANGELOG.md
index 83c07932887..55365214a92 100644
--- a/service/dynamodbstreams/CHANGELOG.md
+++ b/service/dynamodbstreams/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.18 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.17 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/dynamodbstreams/go.mod b/service/dynamodbstreams/go.mod
index e1fbfad7ed5..7a5287dd3d1 100644
--- a/service/dynamodbstreams/go.mod
+++ b/service/dynamodbstreams/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/dynamodbstreams
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/dynamodbstreams/go_module_metadata.go b/service/dynamodbstreams/go_module_metadata.go
index 2f8d9628ee9..c240d7f41fd 100644
--- a/service/dynamodbstreams/go_module_metadata.go
+++ b/service/dynamodbstreams/go_module_metadata.go
@@ -3,4 +3,4 @@
 package dynamodbstreams
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.17"
+const goModuleVersion = "1.24.18"
diff --git a/service/ebs/CHANGELOG.md b/service/ebs/CHANGELOG.md
index a60a4603961..661d423781f 100644
--- a/service/ebs/CHANGELOG.md
+++ b/service/ebs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ebs/go.mod b/service/ebs/go.mod
index cf0b76c265d..bbe8b97067e 100644
--- a/service/ebs/go.mod
+++ b/service/ebs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ebs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ebs/go_module_metadata.go b/service/ebs/go_module_metadata.go
index 5004ac46de3..2bd9532fbab 100644
--- a/service/ebs/go_module_metadata.go
+++ b/service/ebs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ebs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.15"
+const goModuleVersion = "1.27.16"
diff --git a/service/ec2/CHANGELOG.md b/service/ec2/CHANGELOG.md
index 158d42ec2fd..07afb0b7d2e 100644
--- a/service/ec2/CHANGELOG.md
+++ b/service/ec2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.202.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.202.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ec2/go.mod b/service/ec2/go.mod
index 699f97997fe..208d965bc47 100644
--- a/service/ec2/go.mod
+++ b/service/ec2/go.mod
@@ -3,11 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/ec2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ec2/go_module_metadata.go b/service/ec2/go_module_metadata.go
index e59e98fa73e..7f51082bd10 100644
--- a/service/ec2/go_module_metadata.go
+++ b/service/ec2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ec2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.202.1"
+const goModuleVersion = "1.202.2"
diff --git a/service/ec2instanceconnect/CHANGELOG.md b/service/ec2instanceconnect/CHANGELOG.md
index 04c6b01f02b..b9c4d493852 100644
--- a/service/ec2instanceconnect/CHANGELOG.md
+++ b/service/ec2instanceconnect/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ec2instanceconnect/go.mod b/service/ec2instanceconnect/go.mod
index ee1e45dd0d2..b6ed553c67a 100644
--- a/service/ec2instanceconnect/go.mod
+++ b/service/ec2instanceconnect/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ec2instanceconnect/go_module_metadata.go b/service/ec2instanceconnect/go_module_metadata.go
index 3e67b195de9..f7720cdce43 100644
--- a/service/ec2instanceconnect/go_module_metadata.go
+++ b/service/ec2instanceconnect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ec2instanceconnect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/ecr/CHANGELOG.md b/service/ecr/CHANGELOG.md
index db5e5b56550..5da248a2152 100644
--- a/service/ecr/CHANGELOG.md
+++ b/service/ecr/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.40.1 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.40.0 (2025-01-30)
 
 * **Feature**: Temporarily updating dualstack endpoint support
diff --git a/service/ecr/api_op_DescribeImageScanFindings.go b/service/ecr/api_op_DescribeImageScanFindings.go
index c03483f3098..b332e593838 100644
--- a/service/ecr/api_op_DescribeImageScanFindings.go
+++ b/service/ecr/api_op_DescribeImageScanFindings.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,35 +356,31 @@ func (w *ImageScanCompleteWaiter) WaitForOutput(ctx context.Context, params *Des
 func imageScanCompleteStateRetryable(ctx context.Context, input *DescribeImageScanFindingsInput, output *DescribeImageScanFindingsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("imageScanStatus.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ImageScanStatus
+		var v2 types.ScanStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "COMPLETE"
-		value, ok := pathValue.(types.ScanStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ScanStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("imageScanStatus.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ImageScanStatus
+		var v2 types.ScanStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ScanStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ScanStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/ecr/api_op_GetLifecyclePolicyPreview.go b/service/ecr/api_op_GetLifecyclePolicyPreview.go
index 01f4347eb22..482152df722 100644
--- a/service/ecr/api_op_GetLifecyclePolicyPreview.go
+++ b/service/ecr/api_op_GetLifecyclePolicyPreview.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -371,35 +370,21 @@ func (w *LifecyclePolicyPreviewCompleteWaiter) WaitForOutput(ctx context.Context
 func lifecyclePolicyPreviewCompleteStateRetryable(ctx context.Context, input *GetLifecyclePolicyPreviewInput, output *GetLifecyclePolicyPreviewOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETE"
-		value, ok := pathValue.(types.LifecyclePolicyPreviewStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LifecyclePolicyPreviewStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.LifecyclePolicyPreviewStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LifecyclePolicyPreviewStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/ecr/generated.json b/service/ecr/generated.json
index 85d431fc34d..ed8ecd06af5 100644
--- a/service/ecr/generated.json
+++ b/service/ecr/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/ecr/go.mod b/service/ecr/go.mod
index 3c3862cb088..191f4a639ec 100644
--- a/service/ecr/go.mod
+++ b/service/ecr/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/ecr
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/ecr/go.sum b/service/ecr/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/ecr/go.sum
+++ b/service/ecr/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/ecr/go_module_metadata.go b/service/ecr/go_module_metadata.go
index d1ccf0256d7..3cbc094f2d7 100644
--- a/service/ecr/go_module_metadata.go
+++ b/service/ecr/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ecr
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.40.0"
+const goModuleVersion = "1.40.1"
diff --git a/service/ecrpublic/CHANGELOG.md b/service/ecrpublic/CHANGELOG.md
index 7d628a57f1b..4afb5ace7db 100644
--- a/service/ecrpublic/CHANGELOG.md
+++ b/service/ecrpublic/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.1 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.0 (2025-01-30)
 
 * **Feature**: Temporarily updating dualstack endpoint support
diff --git a/service/ecrpublic/go.mod b/service/ecrpublic/go.mod
index fb206cbbac7..36d36b7c864 100644
--- a/service/ecrpublic/go.mod
+++ b/service/ecrpublic/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ecrpublic
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ecrpublic/go_module_metadata.go b/service/ecrpublic/go_module_metadata.go
index 4cb8a5c14c2..ee1cf9642b6 100644
--- a/service/ecrpublic/go_module_metadata.go
+++ b/service/ecrpublic/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ecrpublic
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.0"
+const goModuleVersion = "1.31.1"
diff --git a/service/ecs/CHANGELOG.md b/service/ecs/CHANGELOG.md
index aa2b5cdd360..d561bf35628 100644
--- a/service/ecs/CHANGELOG.md
+++ b/service/ecs/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.53.11 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.53.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ecs/api_op_DescribeServices.go b/service/ecs/api_op_DescribeServices.go
index de928ba8f6f..a84b8a45fb5 100644
--- a/service/ecs/api_op_DescribeServices.go
+++ b/service/ecs/api_op_DescribeServices.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -328,50 +327,48 @@ func (w *ServicesInactiveWaiter) WaitForOutput(ctx context.Context, params *Desc
 func servicesInactiveStateRetryable(ctx context.Context, input *DescribeServicesInput, output *DescribeServicesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("failures[].reason", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Failures
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Reason
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "MISSING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("services[].status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Services
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "INACTIVE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, nil
-			}
+		if match {
+			return false, nil
 		}
 	}
 
@@ -541,94 +538,100 @@ func (w *ServicesStableWaiter) WaitForOutput(ctx context.Context, params *Descri
 func servicesStableStateRetryable(ctx context.Context, input *DescribeServicesInput, output *DescribeServicesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("failures[].reason", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Failures
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Reason
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "MISSING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("services[].status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Services
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "DRAINING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("services[].status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Services
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "INACTIVE"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(services[?!(length(deployments) == `1` && runningCount == desiredCount)]) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Services
+		var v2 []types.Service
+		for _, v := range v1 {
+			v3 := v.Deployments
+			v4 := len(v3)
+			v5 := 1
+			v6 := int64(v4) == int64(v5)
+			v7 := v.RunningCount
+			v8 := v.DesiredCount
+			v9 := int64(v7) == int64(v8)
+			v10 := v6 && v9
+			v11 := !v10
+			if v11 {
+				v2 = append(v2, v)
+			}
 		}
-
+		v12 := len(v2)
+		v13 := 0
+		v14 := int64(v12) == int64(v13)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v14 == bv {
 			return false, nil
 		}
 	}
diff --git a/service/ecs/api_op_DescribeTasks.go b/service/ecs/api_op_DescribeTasks.go
index fc25d92dd17..53e924198d3 100644
--- a/service/ecs/api_op_DescribeTasks.go
+++ b/service/ecs/api_op_DescribeTasks.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -331,77 +330,66 @@ func (w *TasksRunningWaiter) WaitForOutput(ctx context.Context, params *Describe
 func tasksRunningStateRetryable(ctx context.Context, input *DescribeTasksInput, output *DescribeTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("tasks[].lastStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Tasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.LastStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "STOPPED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("failures[].reason", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Failures
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Reason
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "MISSING"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("tasks[].lastStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Tasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.LastStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "RUNNING"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -575,29 +563,20 @@ func (w *TasksStoppedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func tasksStoppedStateRetryable(ctx context.Context, input *DescribeTasksInput, output *DescribeTasksOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("tasks[].lastStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Tasks
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.LastStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "STOPPED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/ecs/generated.json b/service/ecs/generated.json
index 2a0af2dc68d..24f838e8abc 100644
--- a/service/ecs/generated.json
+++ b/service/ecs/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/ecs/go.mod b/service/ecs/go.mod
index a4bb9f054b7..4f30eeea3f8 100644
--- a/service/ecs/go.mod
+++ b/service/ecs/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/ecs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/ecs/go.sum b/service/ecs/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/ecs/go.sum
+++ b/service/ecs/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/ecs/go_module_metadata.go b/service/ecs/go_module_metadata.go
index beecbe15d2c..78d8e803f99 100644
--- a/service/ecs/go_module_metadata.go
+++ b/service/ecs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ecs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.53.10"
+const goModuleVersion = "1.53.11"
diff --git a/service/efs/CHANGELOG.md b/service/efs/CHANGELOG.md
index 3872c4f0156..5b063a411e6 100644
--- a/service/efs/CHANGELOG.md
+++ b/service/efs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/efs/go.mod b/service/efs/go.mod
index 47b90a4eb5e..918e281435a 100644
--- a/service/efs/go.mod
+++ b/service/efs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/efs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/efs/go_module_metadata.go b/service/efs/go_module_metadata.go
index 3ca62b68fa2..366035a1103 100644
--- a/service/efs/go_module_metadata.go
+++ b/service/efs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package efs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.8"
+const goModuleVersion = "1.34.9"
diff --git a/service/eks/CHANGELOG.md b/service/eks/CHANGELOG.md
index 96cb3738416..592d3d81e75 100644
--- a/service/eks/CHANGELOG.md
+++ b/service/eks/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.57.2 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.57.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/eks/api_op_DescribeAddon.go b/service/eks/api_op_DescribeAddon.go
index 60f0ec89c0e..aef296298b4 100644
--- a/service/eks/api_op_DescribeAddon.go
+++ b/service/eks/api_op_DescribeAddon.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -322,52 +321,46 @@ func (w *AddonActiveWaiter) WaitForOutput(ctx context.Context, params *DescribeA
 func addonActiveStateRetryable(ctx context.Context, input *DescribeAddonInput, output *DescribeAddonOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("addon.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Addon
+		var v2 types.AddonStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.AddonStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("addon.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Addon
+		var v2 types.AddonStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEGRADED"
-		value, ok := pathValue.(types.AddonStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("addon.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Addon
+		var v2 types.AddonStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.AddonStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -537,18 +530,16 @@ func (w *AddonDeletedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func addonDeletedStateRetryable(ctx context.Context, input *DescribeAddonInput, output *DescribeAddonOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("addon.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Addon
+		var v2 types.AddonStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.AddonStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AddonStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/eks/api_op_DescribeCluster.go b/service/eks/api_op_DescribeCluster.go
index e8c7bed7ddf..f08d6adb246 100644
--- a/service/eks/api_op_DescribeCluster.go
+++ b/service/eks/api_op_DescribeCluster.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -322,52 +321,46 @@ func (w *ClusterActiveWaiter) WaitForOutput(ctx context.Context, params *Describ
 func clusterActiveStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -538,52 +531,46 @@ func (w *ClusterDeletedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("cluster.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.ClusterStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/eks/api_op_DescribeFargateProfile.go b/service/eks/api_op_DescribeFargateProfile.go
index b0c66290fd7..5db62ee5edb 100644
--- a/service/eks/api_op_DescribeFargateProfile.go
+++ b/service/eks/api_op_DescribeFargateProfile.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -320,35 +319,31 @@ func (w *FargateProfileActiveWaiter) WaitForOutput(ctx context.Context, params *
 func fargateProfileActiveStateRetryable(ctx context.Context, input *DescribeFargateProfileInput, output *DescribeFargateProfileOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("fargateProfile.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.FargateProfile
+		var v2 types.FargateProfileStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.FargateProfileStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FargateProfileStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("fargateProfile.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.FargateProfile
+		var v2 types.FargateProfileStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.FargateProfileStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FargateProfileStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -521,18 +516,16 @@ func (w *FargateProfileDeletedWaiter) WaitForOutput(ctx context.Context, params
 func fargateProfileDeletedStateRetryable(ctx context.Context, input *DescribeFargateProfileInput, output *DescribeFargateProfileOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("fargateProfile.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.FargateProfile
+		var v2 types.FargateProfileStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.FargateProfileStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.FargateProfileStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/eks/api_op_DescribeNodegroup.go b/service/eks/api_op_DescribeNodegroup.go
index 51b0c647ce3..d59f28c6cb0 100644
--- a/service/eks/api_op_DescribeNodegroup.go
+++ b/service/eks/api_op_DescribeNodegroup.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -318,35 +317,31 @@ func (w *NodegroupActiveWaiter) WaitForOutput(ctx context.Context, params *Descr
 func nodegroupActiveStateRetryable(ctx context.Context, input *DescribeNodegroupInput, output *DescribeNodegroupOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("nodegroup.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Nodegroup
+		var v2 types.NodegroupStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.NodegroupStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("nodegroup.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Nodegroup
+		var v2 types.NodegroupStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.NodegroupStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -517,18 +512,16 @@ func (w *NodegroupDeletedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func nodegroupDeletedStateRetryable(ctx context.Context, input *DescribeNodegroupInput, output *DescribeNodegroupOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("nodegroup.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Nodegroup
+		var v2 types.NodegroupStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.NodegroupStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodegroupStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/eks/generated.json b/service/eks/generated.json
index 1f6bb96e4dc..7b0ab817fbd 100644
--- a/service/eks/generated.json
+++ b/service/eks/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/eks/go.mod b/service/eks/go.mod
index b4bd9313e05..5732127b9bc 100644
--- a/service/eks/go.mod
+++ b/service/eks/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/eks
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/eks/go.sum b/service/eks/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/eks/go.sum
+++ b/service/eks/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/eks/go_module_metadata.go b/service/eks/go_module_metadata.go
index 60d34181be3..65e1e0fb87e 100644
--- a/service/eks/go_module_metadata.go
+++ b/service/eks/go_module_metadata.go
@@ -3,4 +3,4 @@
 package eks
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.57.1"
+const goModuleVersion = "1.57.2"
diff --git a/service/eksauth/CHANGELOG.md b/service/eksauth/CHANGELOG.md
index 536b0cb4c18..a67bd8cf971 100644
--- a/service/eksauth/CHANGELOG.md
+++ b/service/eksauth/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/eksauth/go.mod b/service/eksauth/go.mod
index 82f4ace32bb..ea421b4ef4e 100644
--- a/service/eksauth/go.mod
+++ b/service/eksauth/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/eksauth
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/eksauth/go_module_metadata.go b/service/eksauth/go_module_metadata.go
index ed947da22b3..a66f873e512 100644
--- a/service/eksauth/go_module_metadata.go
+++ b/service/eksauth/go_module_metadata.go
@@ -3,4 +3,4 @@
 package eksauth
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.15"
+const goModuleVersion = "1.7.16"
diff --git a/service/elasticache/CHANGELOG.md b/service/elasticache/CHANGELOG.md
index 62e6954d5bd..3d36a4ad340 100644
--- a/service/elasticache/CHANGELOG.md
+++ b/service/elasticache/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.44.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.44.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticache/api_op_DescribeCacheClusters.go b/service/elasticache/api_op_DescribeCacheClusters.go
index 7f69248920e..2861ef3ac45 100644
--- a/service/elasticache/api_op_DescribeCacheClusters.go
+++ b/service/elasticache/api_op_DescribeCacheClusters.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -364,29 +363,20 @@ func (w *CacheClusterAvailableWaiter) WaitForOutput(ctx context.Context, params
 func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCacheClustersInput, output *DescribeCacheClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -396,98 +386,94 @@ func cacheClusterAvailableStateRetryable(ctx context.Context, input *DescribeCac
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-network"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "restore-failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -659,29 +645,20 @@ func (w *CacheClusterDeletedWaiter) WaitForOutput(ctx context.Context, params *D
 func cacheClusterDeletedStateRetryable(ctx context.Context, input *DescribeCacheClustersInput, output *DescribeCacheClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -703,146 +680,140 @@ func cacheClusterDeletedStateRetryable(ctx context.Context, input *DescribeCache
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-network"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "restore-failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("CacheClusters[].CacheClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.CacheClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.CacheClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "snapshotting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/elasticache/api_op_DescribeReplicationGroups.go b/service/elasticache/api_op_DescribeReplicationGroups.go
index 7043dcb0572..b4ea3f3c1de 100644
--- a/service/elasticache/api_op_DescribeReplicationGroups.go
+++ b/service/elasticache/api_op_DescribeReplicationGroups.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -340,29 +339,20 @@ func (w *ReplicationGroupAvailableWaiter) WaitForOutput(ctx context.Context, par
 func replicationGroupAvailableStateRetryable(ctx context.Context, input *DescribeReplicationGroupsInput, output *DescribeReplicationGroupsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationGroups[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationGroups
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -372,26 +362,25 @@ func replicationGroupAvailableStateRetryable(ctx context.Context, input *Describ
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationGroups[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationGroups
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -563,29 +552,20 @@ func (w *ReplicationGroupDeletedWaiter) WaitForOutput(ctx context.Context, param
 func replicationGroupDeletedStateRetryable(ctx context.Context, input *DescribeReplicationGroupsInput, output *DescribeReplicationGroupsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationGroups[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationGroups
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -595,26 +575,25 @@ func replicationGroupDeletedStateRetryable(ctx context.Context, input *DescribeR
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ReplicationGroups[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationGroups
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/elasticache/generated.json b/service/elasticache/generated.json
index 3913acb86d4..3308d3be802 100644
--- a/service/elasticache/generated.json
+++ b/service/elasticache/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/elasticache/go.mod b/service/elasticache/go.mod
index e54cf4d7571..7b35e9e1f75 100644
--- a/service/elasticache/go.mod
+++ b/service/elasticache/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/elasticache
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/elasticache/go.sum b/service/elasticache/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/elasticache/go.sum
+++ b/service/elasticache/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/elasticache/go_module_metadata.go b/service/elasticache/go_module_metadata.go
index ad0bd5d0385..0fe2e2c8041 100644
--- a/service/elasticache/go_module_metadata.go
+++ b/service/elasticache/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticache
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.9"
+const goModuleVersion = "1.44.10"
diff --git a/service/elasticbeanstalk/CHANGELOG.md b/service/elasticbeanstalk/CHANGELOG.md
index 5006e7f0355..3b0bca3a289 100644
--- a/service/elasticbeanstalk/CHANGELOG.md
+++ b/service/elasticbeanstalk/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.28.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticbeanstalk/api_op_DescribeEnvironments.go b/service/elasticbeanstalk/api_op_DescribeEnvironments.go
index e31f453ac3c..3c38a2b3d8e 100644
--- a/service/elasticbeanstalk/api_op_DescribeEnvironments.go
+++ b/service/elasticbeanstalk/api_op_DescribeEnvironments.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -352,29 +351,18 @@ func (w *EnvironmentExistsWaiter) WaitForOutput(ctx context.Context, params *Des
 func environmentExistsStateRetryable(ctx context.Context, input *DescribeEnvironmentsInput, output *DescribeEnvironmentsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Ready"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -384,29 +372,18 @@ func environmentExistsStateRetryable(ctx context.Context, input *DescribeEnviron
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Launching"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -583,29 +560,18 @@ func (w *EnvironmentTerminatedWaiter) WaitForOutput(ctx context.Context, params
 func environmentTerminatedStateRetryable(ctx context.Context, input *DescribeEnvironmentsInput, output *DescribeEnvironmentsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Terminated"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -615,29 +581,18 @@ func environmentTerminatedStateRetryable(ctx context.Context, input *DescribeEnv
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Terminating"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -812,29 +767,18 @@ func (w *EnvironmentUpdatedWaiter) WaitForOutput(ctx context.Context, params *De
 func environmentUpdatedStateRetryable(ctx context.Context, input *DescribeEnvironmentsInput, output *DescribeEnvironmentsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Ready"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -844,29 +788,18 @@ func environmentUpdatedStateRetryable(ctx context.Context, input *DescribeEnviro
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Environments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environments
+		var v2 []types.EnvironmentStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Updating"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EnvironmentStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EnvironmentStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/elasticbeanstalk/generated.json b/service/elasticbeanstalk/generated.json
index 681e2d11353..9d919599cb4 100644
--- a/service/elasticbeanstalk/generated.json
+++ b/service/elasticbeanstalk/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/elasticbeanstalk/go.mod b/service/elasticbeanstalk/go.mod
index 64bf54070af..ac229eaed36 100644
--- a/service/elasticbeanstalk/go.mod
+++ b/service/elasticbeanstalk/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/elasticbeanstalk/go.sum b/service/elasticbeanstalk/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/elasticbeanstalk/go.sum
+++ b/service/elasticbeanstalk/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/elasticbeanstalk/go_module_metadata.go b/service/elasticbeanstalk/go_module_metadata.go
index 1616044479f..fa4266ca835 100644
--- a/service/elasticbeanstalk/go_module_metadata.go
+++ b/service/elasticbeanstalk/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticbeanstalk
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.14"
+const goModuleVersion = "1.28.15"
diff --git a/service/elasticinference/CHANGELOG.md b/service/elasticinference/CHANGELOG.md
index 2bc59a49a13..f06642640b4 100644
--- a/service/elasticinference/CHANGELOG.md
+++ b/service/elasticinference/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticinference/go.mod b/service/elasticinference/go.mod
index 7bab4733d6c..b21f8c48150 100644
--- a/service/elasticinference/go.mod
+++ b/service/elasticinference/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/elasticinference
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/elasticinference/go_module_metadata.go b/service/elasticinference/go_module_metadata.go
index 791ca7b1521..5195d2baa9e 100644
--- a/service/elasticinference/go_module_metadata.go
+++ b/service/elasticinference/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticinference
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.14"
+const goModuleVersion = "1.23.15"
diff --git a/service/elasticloadbalancing/CHANGELOG.md b/service/elasticloadbalancing/CHANGELOG.md
index af6aaf443cd..6717b592fdc 100644
--- a/service/elasticloadbalancing/CHANGELOG.md
+++ b/service/elasticloadbalancing/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.28.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go
index bc4ed4b6b38..9207768c2a0 100644
--- a/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go
+++ b/service/elasticloadbalancing/api_op_DescribeInstanceHealth.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -325,26 +324,25 @@ func (w *AnyInstanceInServiceWaiter) WaitForOutput(ctx context.Context, params *
 func anyInstanceInServiceStateRetryable(ctx context.Context, input *DescribeInstanceHealthInput, output *DescribeInstanceHealthOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("InstanceStates[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.InstanceStates
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.State
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "InService"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, nil
-			}
+		if match {
+			return false, nil
 		}
 	}
 
@@ -516,29 +514,20 @@ func (w *InstanceDeregisteredWaiter) WaitForOutput(ctx context.Context, params *
 func instanceDeregisteredStateRetryable(ctx context.Context, input *DescribeInstanceHealthInput, output *DescribeInstanceHealthOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("InstanceStates[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.InstanceStates
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.State
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "OutOfService"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -725,29 +714,20 @@ func (w *InstanceInServiceWaiter) WaitForOutput(ctx context.Context, params *Des
 func instanceInServiceStateRetryable(ctx context.Context, input *DescribeInstanceHealthInput, output *DescribeInstanceHealthOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("InstanceStates[].State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.InstanceStates
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.State
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "InService"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/elasticloadbalancing/generated.json b/service/elasticloadbalancing/generated.json
index a00f16d4829..bb0221e46bf 100644
--- a/service/elasticloadbalancing/generated.json
+++ b/service/elasticloadbalancing/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/elasticloadbalancing/go.mod b/service/elasticloadbalancing/go.mod
index f95fd717201..f885356d46e 100644
--- a/service/elasticloadbalancing/go.mod
+++ b/service/elasticloadbalancing/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/elasticloadbalancing/go.sum b/service/elasticloadbalancing/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/elasticloadbalancing/go.sum
+++ b/service/elasticloadbalancing/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/elasticloadbalancing/go_module_metadata.go b/service/elasticloadbalancing/go_module_metadata.go
index 036a19f6a4c..2ba5d4bcf9a 100644
--- a/service/elasticloadbalancing/go_module_metadata.go
+++ b/service/elasticloadbalancing/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticloadbalancing
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.14"
+const goModuleVersion = "1.28.15"
diff --git a/service/elasticloadbalancingv2/CHANGELOG.md b/service/elasticloadbalancingv2/CHANGELOG.md
index 160abbb2b3c..35c9ddb5836 100644
--- a/service/elasticloadbalancingv2/CHANGELOG.md
+++ b/service/elasticloadbalancingv2/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.43.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.43.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go
index 65dfc6a8ab1..f37ff8b55c4 100644
--- a/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go
+++ b/service/elasticloadbalancingv2/api_op_DescribeLoadBalancers.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -326,29 +325,23 @@ func (w *LoadBalancerAvailableWaiter) WaitForOutput(ctx context.Context, params
 func loadBalancerAvailableStateRetryable(ctx context.Context, input *DescribeLoadBalancersInput, output *DescribeLoadBalancersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LoadBalancers[].State.Code", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.LoadBalancers
+		var v2 []types.LoadBalancerStateEnum
+		for _, v := range v1 {
+			v3 := v.State
+			var v4 types.LoadBalancerStateEnum
+			if v3 != nil {
+				v5 := v3.Code
+				v4 = v5
+			}
+			v2 = append(v2, v4)
 		}
-
 		expectedValue := "active"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.LoadBalancerStateEnum)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.LoadBalancerStateEnum value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -358,26 +351,28 @@ func loadBalancerAvailableStateRetryable(ctx context.Context, input *DescribeLoa
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LoadBalancers[].State.Code", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.LoadBalancers
+		var v2 []types.LoadBalancerStateEnum
+		for _, v := range v1 {
+			v3 := v.State
+			var v4 types.LoadBalancerStateEnum
+			if v3 != nil {
+				v5 := v3.Code
+				v4 = v5
+			}
+			v2 = append(v2, v4)
 		}
-
 		expectedValue := "provisioning"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.LoadBalancerStateEnum)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.LoadBalancerStateEnum value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return true, nil
-			}
+		if match {
+			return true, nil
 		}
 	}
 
@@ -742,29 +737,23 @@ func (w *LoadBalancersDeletedWaiter) WaitForOutput(ctx context.Context, params *
 func loadBalancersDeletedStateRetryable(ctx context.Context, input *DescribeLoadBalancersInput, output *DescribeLoadBalancersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LoadBalancers[].State.Code", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.LoadBalancers
+		var v2 []types.LoadBalancerStateEnum
+		for _, v := range v1 {
+			v3 := v.State
+			var v4 types.LoadBalancerStateEnum
+			if v3 != nil {
+				v5 := v3.Code
+				v4 = v5
+			}
+			v2 = append(v2, v4)
 		}
-
 		expectedValue := "active"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.LoadBalancerStateEnum)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.LoadBalancerStateEnum value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go
index 4090c1a5a25..b39dbca47d6 100644
--- a/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go
+++ b/service/elasticloadbalancingv2/api_op_DescribeTargetHealth.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -332,29 +331,23 @@ func targetDeregisteredStateRetryable(ctx context.Context, input *DescribeTarget
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TargetHealthDescriptions[].TargetHealth.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TargetHealthDescriptions
+		var v2 []types.TargetHealthStateEnum
+		for _, v := range v1 {
+			v3 := v.TargetHealth
+			var v4 types.TargetHealthStateEnum
+			if v3 != nil {
+				v5 := v3.State
+				v4 = v5
+			}
+			v2 = append(v2, v4)
 		}
-
 		expectedValue := "unused"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.TargetHealthStateEnum)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.TargetHealthStateEnum value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -529,29 +522,23 @@ func (w *TargetInServiceWaiter) WaitForOutput(ctx context.Context, params *Descr
 func targetInServiceStateRetryable(ctx context.Context, input *DescribeTargetHealthInput, output *DescribeTargetHealthOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TargetHealthDescriptions[].TargetHealth.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TargetHealthDescriptions
+		var v2 []types.TargetHealthStateEnum
+		for _, v := range v1 {
+			v3 := v.TargetHealth
+			var v4 types.TargetHealthStateEnum
+			if v3 != nil {
+				v5 := v3.State
+				v4 = v5
+			}
+			v2 = append(v2, v4)
 		}
-
 		expectedValue := "healthy"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.TargetHealthStateEnum)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.TargetHealthStateEnum value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/elasticloadbalancingv2/generated.json b/service/elasticloadbalancingv2/generated.json
index 6f740b74b18..5e880995367 100644
--- a/service/elasticloadbalancingv2/generated.json
+++ b/service/elasticloadbalancingv2/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/elasticloadbalancingv2/go.mod b/service/elasticloadbalancingv2/go.mod
index 1bf7ecf9bf2..93ba840352f 100644
--- a/service/elasticloadbalancingv2/go.mod
+++ b/service/elasticloadbalancingv2/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/elasticloadbalancingv2/go.sum b/service/elasticloadbalancingv2/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/elasticloadbalancingv2/go.sum
+++ b/service/elasticloadbalancingv2/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/elasticloadbalancingv2/go_module_metadata.go b/service/elasticloadbalancingv2/go_module_metadata.go
index c27f8458cbc..5a6b7eac6b2 100644
--- a/service/elasticloadbalancingv2/go_module_metadata.go
+++ b/service/elasticloadbalancingv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticloadbalancingv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.43.9"
+const goModuleVersion = "1.43.10"
diff --git a/service/elasticsearchservice/CHANGELOG.md b/service/elasticsearchservice/CHANGELOG.md
index ae9a4eff255..89e5a4a70f1 100644
--- a/service/elasticsearchservice/CHANGELOG.md
+++ b/service/elasticsearchservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elasticsearchservice/go.mod b/service/elasticsearchservice/go.mod
index 5270366b093..462ac778f53 100644
--- a/service/elasticsearchservice/go.mod
+++ b/service/elasticsearchservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/elasticsearchservice/go_module_metadata.go b/service/elasticsearchservice/go_module_metadata.go
index 54ee907fe0d..812efc7b5da 100644
--- a/service/elasticsearchservice/go_module_metadata.go
+++ b/service/elasticsearchservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elasticsearchservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.15"
+const goModuleVersion = "1.32.16"
diff --git a/service/elastictranscoder/CHANGELOG.md b/service/elastictranscoder/CHANGELOG.md
index 2402d6c15d3..158f524f9ab 100644
--- a/service/elastictranscoder/CHANGELOG.md
+++ b/service/elastictranscoder/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.27.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/elastictranscoder/api_op_ReadJob.go b/service/elastictranscoder/api_op_ReadJob.go
index caa18fdd5b4..aa4e3967b3e 100644
--- a/service/elastictranscoder/api_op_ReadJob.go
+++ b/service/elastictranscoder/api_op_ReadJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -313,52 +312,52 @@ func (w *JobCompleteWaiter) WaitForOutput(ctx context.Context, params *ReadJobIn
 func jobCompleteStateRetryable(ctx context.Context, input *ReadJobInput, output *ReadJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Job.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Job
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Complete"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Job.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Job
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Canceled"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Job.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Job
+		var v2 *string
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "Error"
-		value, ok := pathValue.(*string)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var pathValue string
+		if v2 != nil {
+			pathValue = string(*v2)
 		}
-
-		if string(*value) == expectedValue {
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/elastictranscoder/generated.json b/service/elastictranscoder/generated.json
index afdad7e85f5..8c14a859ca3 100644
--- a/service/elastictranscoder/generated.json
+++ b/service/elastictranscoder/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/elastictranscoder/go.mod b/service/elastictranscoder/go.mod
index 140d274432a..a4684ea3d80 100644
--- a/service/elastictranscoder/go.mod
+++ b/service/elastictranscoder/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/elastictranscoder
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/elastictranscoder/go.sum b/service/elastictranscoder/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/elastictranscoder/go.sum
+++ b/service/elastictranscoder/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/elastictranscoder/go_module_metadata.go b/service/elastictranscoder/go_module_metadata.go
index a5ede293e19..bc5ccd6a427 100644
--- a/service/elastictranscoder/go_module_metadata.go
+++ b/service/elastictranscoder/go_module_metadata.go
@@ -3,4 +3,4 @@
 package elastictranscoder
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.14"
+const goModuleVersion = "1.27.15"
diff --git a/service/emr/CHANGELOG.md b/service/emr/CHANGELOG.md
index 4cd92d62a27..cff9bbcb1c1 100644
--- a/service/emr/CHANGELOG.md
+++ b/service/emr/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.47.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.47.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/emr/api_op_DescribeCluster.go b/service/emr/api_op_DescribeCluster.go
index e95218cae36..19e44328a7f 100644
--- a/service/emr/api_op_DescribeCluster.go
+++ b/service/emr/api_op_DescribeCluster.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -315,86 +314,101 @@ func (w *ClusterRunningWaiter) WaitForOutput(ctx context.Context, params *Descri
 func clusterRunningStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "RUNNING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "WAITING"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "WAITING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "TERMINATING"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "TERMINATING"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "TERMINATED"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "TERMINATED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "TERMINATED_WITH_ERRORS"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "TERMINATED_WITH_ERRORS"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -565,35 +579,41 @@ func (w *ClusterTerminatedWaiter) WaitForOutput(ctx context.Context, params *Des
 func clusterTerminatedStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "TERMINATED"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "TERMINATED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 *types.ClusterStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "TERMINATED_WITH_ERRORS"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
+		var v4 types.ClusterState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "TERMINATED_WITH_ERRORS"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/emr/api_op_DescribeStep.go b/service/emr/api_op_DescribeStep.go
index 6416c2c3077..3e8ce76c018 100644
--- a/service/emr/api_op_DescribeStep.go
+++ b/service/emr/api_op_DescribeStep.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -318,52 +317,61 @@ func (w *StepCompleteWaiter) WaitForOutput(ctx context.Context, params *Describe
 func stepCompleteStateRetryable(ctx context.Context, input *DescribeStepInput, output *DescribeStepOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Step.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Step
+		var v2 *types.StepStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.StepState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue)
+		var v4 types.StepState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "COMPLETED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Step.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Step
+		var v2 *types.StepStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "FAILED"
-		value, ok := pathValue.(types.StepState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue)
+		var v4 types.StepState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "FAILED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Step.Status.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Step
+		var v2 *types.StepStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
-		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.StepState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StepState value, got %T", pathValue)
+		var v4 types.StepState
+		if v2 != nil {
+			v5 := v2.State
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "CANCELLED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/emr/generated.json b/service/emr/generated.json
index 01a159240fe..ad52a57f774 100644
--- a/service/emr/generated.json
+++ b/service/emr/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/emr/go.mod b/service/emr/go.mod
index 833da1977f0..fef31531794 100644
--- a/service/emr/go.mod
+++ b/service/emr/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/emr
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/emr/go.sum b/service/emr/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/emr/go.sum
+++ b/service/emr/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/emr/go_module_metadata.go b/service/emr/go_module_metadata.go
index 82f615d374c..b2863e286f8 100644
--- a/service/emr/go_module_metadata.go
+++ b/service/emr/go_module_metadata.go
@@ -3,4 +3,4 @@
 package emr
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.47.9"
+const goModuleVersion = "1.47.10"
diff --git a/service/emrcontainers/CHANGELOG.md b/service/emrcontainers/CHANGELOG.md
index ba18915888f..54327346955 100644
--- a/service/emrcontainers/CHANGELOG.md
+++ b/service/emrcontainers/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/emrcontainers/go.mod b/service/emrcontainers/go.mod
index f996bf30fdf..3054c6aa7a2 100644
--- a/service/emrcontainers/go.mod
+++ b/service/emrcontainers/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/emrcontainers
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/emrcontainers/go_module_metadata.go b/service/emrcontainers/go_module_metadata.go
index d9f162b883d..c1827fa373d 100644
--- a/service/emrcontainers/go_module_metadata.go
+++ b/service/emrcontainers/go_module_metadata.go
@@ -3,4 +3,4 @@
 package emrcontainers
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.14"
+const goModuleVersion = "1.33.15"
diff --git a/service/emrserverless/CHANGELOG.md b/service/emrserverless/CHANGELOG.md
index b457099bf78..f5fe262a426 100644
--- a/service/emrserverless/CHANGELOG.md
+++ b/service/emrserverless/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/emrserverless/go.mod b/service/emrserverless/go.mod
index 3d780ef973f..113c4937876 100644
--- a/service/emrserverless/go.mod
+++ b/service/emrserverless/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/emrserverless
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/emrserverless/go_module_metadata.go b/service/emrserverless/go_module_metadata.go
index 7d6d80b3759..4e75069d409 100644
--- a/service/emrserverless/go_module_metadata.go
+++ b/service/emrserverless/go_module_metadata.go
@@ -3,4 +3,4 @@
 package emrserverless
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.6"
+const goModuleVersion = "1.27.7"
diff --git a/service/entityresolution/CHANGELOG.md b/service/entityresolution/CHANGELOG.md
index 724e166fdc3..acc9426f356 100644
--- a/service/entityresolution/CHANGELOG.md
+++ b/service/entityresolution/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.15.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.15.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/entityresolution/go.mod b/service/entityresolution/go.mod
index 52d85dec7df..6577500a4b7 100644
--- a/service/entityresolution/go.mod
+++ b/service/entityresolution/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/entityresolution
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/entityresolution/go_module_metadata.go b/service/entityresolution/go_module_metadata.go
index b4bd6f4de53..477969b27bd 100644
--- a/service/entityresolution/go_module_metadata.go
+++ b/service/entityresolution/go_module_metadata.go
@@ -3,4 +3,4 @@
 package entityresolution
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.15.13"
+const goModuleVersion = "1.15.14"
diff --git a/service/eventbridge/CHANGELOG.md b/service/eventbridge/CHANGELOG.md
index 450c689c477..c104d6ce210 100644
--- a/service/eventbridge/CHANGELOG.md
+++ b/service/eventbridge/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/eventbridge/go.mod b/service/eventbridge/go.mod
index 8db63beab8a..a14e033c1df 100644
--- a/service/eventbridge/go.mod
+++ b/service/eventbridge/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/eventbridge
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/eventbridge/go_module_metadata.go b/service/eventbridge/go_module_metadata.go
index be1250723da..0d264f9893e 100644
--- a/service/eventbridge/go_module_metadata.go
+++ b/service/eventbridge/go_module_metadata.go
@@ -3,4 +3,4 @@
 package eventbridge
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.8"
+const goModuleVersion = "1.36.9"
diff --git a/service/evidently/CHANGELOG.md b/service/evidently/CHANGELOG.md
index b9931b380a7..ac602b8330f 100644
--- a/service/evidently/CHANGELOG.md
+++ b/service/evidently/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/evidently/go.mod b/service/evidently/go.mod
index 9dd4cb3573a..64e88415cc5 100644
--- a/service/evidently/go.mod
+++ b/service/evidently/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/evidently
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/evidently/go_module_metadata.go b/service/evidently/go_module_metadata.go
index 4e242054f08..2a07278e008 100644
--- a/service/evidently/go_module_metadata.go
+++ b/service/evidently/go_module_metadata.go
@@ -3,4 +3,4 @@
 package evidently
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/finspace/CHANGELOG.md b/service/finspace/CHANGELOG.md
index 6bb7e7b2ae3..a8d55475e04 100644
--- a/service/finspace/CHANGELOG.md
+++ b/service/finspace/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/finspace/go.mod b/service/finspace/go.mod
index 860803d58c0..4659e96539c 100644
--- a/service/finspace/go.mod
+++ b/service/finspace/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/finspace
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/finspace/go_module_metadata.go b/service/finspace/go_module_metadata.go
index 61615bcd4b7..d6bb1fc844d 100644
--- a/service/finspace/go_module_metadata.go
+++ b/service/finspace/go_module_metadata.go
@@ -3,4 +3,4 @@
 package finspace
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/finspacedata/CHANGELOG.md b/service/finspacedata/CHANGELOG.md
index 87fa1d08144..c7c3dad3228 100644
--- a/service/finspacedata/CHANGELOG.md
+++ b/service/finspacedata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/finspacedata/go.mod b/service/finspacedata/go.mod
index 47eabf8daa5..09d3f000ab0 100644
--- a/service/finspacedata/go.mod
+++ b/service/finspacedata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/finspacedata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/finspacedata/go_module_metadata.go b/service/finspacedata/go_module_metadata.go
index eec8d7b90b9..0fac2e2485a 100644
--- a/service/finspacedata/go_module_metadata.go
+++ b/service/finspacedata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package finspacedata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/firehose/CHANGELOG.md b/service/firehose/CHANGELOG.md
index 3bbca1546f8..9e370abef1d 100644
--- a/service/firehose/CHANGELOG.md
+++ b/service/firehose/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/firehose/go.mod b/service/firehose/go.mod
index a4fe7e516f5..371742b83f6 100644
--- a/service/firehose/go.mod
+++ b/service/firehose/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/firehose
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/firehose/go_module_metadata.go b/service/firehose/go_module_metadata.go
index 67c1b5a5751..347fb43d68e 100644
--- a/service/firehose/go_module_metadata.go
+++ b/service/firehose/go_module_metadata.go
@@ -3,4 +3,4 @@
 package firehose
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.1"
+const goModuleVersion = "1.36.2"
diff --git a/service/fis/CHANGELOG.md b/service/fis/CHANGELOG.md
index b2584aef036..f181be5a5a0 100644
--- a/service/fis/CHANGELOG.md
+++ b/service/fis/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/fis/go.mod b/service/fis/go.mod
index 3b6efc976b1..4fd3b68ccb2 100644
--- a/service/fis/go.mod
+++ b/service/fis/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/fis
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/fis/go_module_metadata.go b/service/fis/go_module_metadata.go
index 9224f5ff8ee..aef771d66ff 100644
--- a/service/fis/go_module_metadata.go
+++ b/service/fis/go_module_metadata.go
@@ -3,4 +3,4 @@
 package fis
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.8"
+const goModuleVersion = "1.31.9"
diff --git a/service/fms/CHANGELOG.md b/service/fms/CHANGELOG.md
index 26c4e8fa3e7..a04c4fe80c0 100644
--- a/service/fms/CHANGELOG.md
+++ b/service/fms/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.39.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.39.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/fms/go.mod b/service/fms/go.mod
index 9f5fc0ac0c8..bd442fec4cd 100644
--- a/service/fms/go.mod
+++ b/service/fms/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/fms
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/fms/go_module_metadata.go b/service/fms/go_module_metadata.go
index 23931b91549..21fee6d0369 100644
--- a/service/fms/go_module_metadata.go
+++ b/service/fms/go_module_metadata.go
@@ -3,4 +3,4 @@
 package fms
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.39.4"
+const goModuleVersion = "1.39.5"
diff --git a/service/forecast/CHANGELOG.md b/service/forecast/CHANGELOG.md
index 60bb754c6a4..fddd70b4b12 100644
--- a/service/forecast/CHANGELOG.md
+++ b/service/forecast/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/forecast/go.mod b/service/forecast/go.mod
index 5b89b0524fc..d8c138b9225 100644
--- a/service/forecast/go.mod
+++ b/service/forecast/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/forecast
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/forecast/go_module_metadata.go b/service/forecast/go_module_metadata.go
index 7118b062449..4cbe1a3b19a 100644
--- a/service/forecast/go_module_metadata.go
+++ b/service/forecast/go_module_metadata.go
@@ -3,4 +3,4 @@
 package forecast
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.13"
+const goModuleVersion = "1.36.14"
diff --git a/service/forecastquery/CHANGELOG.md b/service/forecastquery/CHANGELOG.md
index d9b16c0f3d0..7a55e0dba89 100644
--- a/service/forecastquery/CHANGELOG.md
+++ b/service/forecastquery/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/forecastquery/go.mod b/service/forecastquery/go.mod
index 34e579cf285..11013a3a81a 100644
--- a/service/forecastquery/go.mod
+++ b/service/forecastquery/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/forecastquery
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/forecastquery/go_module_metadata.go b/service/forecastquery/go_module_metadata.go
index 9f21dbe2833..38643c72c77 100644
--- a/service/forecastquery/go_module_metadata.go
+++ b/service/forecastquery/go_module_metadata.go
@@ -3,4 +3,4 @@
 package forecastquery
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/frauddetector/CHANGELOG.md b/service/frauddetector/CHANGELOG.md
index dab4a7fab42..c7993404ffc 100644
--- a/service/frauddetector/CHANGELOG.md
+++ b/service/frauddetector/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.35.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.35.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/frauddetector/go.mod b/service/frauddetector/go.mod
index efbede8d899..3bfc26ebd88 100644
--- a/service/frauddetector/go.mod
+++ b/service/frauddetector/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/frauddetector
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/frauddetector/go_module_metadata.go b/service/frauddetector/go_module_metadata.go
index 3121d32a366..55f004a6acc 100644
--- a/service/frauddetector/go_module_metadata.go
+++ b/service/frauddetector/go_module_metadata.go
@@ -3,4 +3,4 @@
 package frauddetector
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.35.13"
+const goModuleVersion = "1.35.14"
diff --git a/service/freetier/CHANGELOG.md b/service/freetier/CHANGELOG.md
index de2e19c01fc..00ff68f1348 100644
--- a/service/freetier/CHANGELOG.md
+++ b/service/freetier/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/freetier/go.mod b/service/freetier/go.mod
index ec21b4dcd3a..4faa491f390 100644
--- a/service/freetier/go.mod
+++ b/service/freetier/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/freetier
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/freetier/go_module_metadata.go b/service/freetier/go_module_metadata.go
index adc6a6d7f5a..af2d257a3b1 100644
--- a/service/freetier/go_module_metadata.go
+++ b/service/freetier/go_module_metadata.go
@@ -3,4 +3,4 @@
 package freetier
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.13"
+const goModuleVersion = "1.7.14"
diff --git a/service/fsx/CHANGELOG.md b/service/fsx/CHANGELOG.md
index d85425f6711..9654877bf7c 100644
--- a/service/fsx/CHANGELOG.md
+++ b/service/fsx/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.51.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.51.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/fsx/go.mod b/service/fsx/go.mod
index 65ae2513081..fb5071988cf 100644
--- a/service/fsx/go.mod
+++ b/service/fsx/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/fsx
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/fsx/go_module_metadata.go b/service/fsx/go_module_metadata.go
index c62887a7075..bcde0ad98fe 100644
--- a/service/fsx/go_module_metadata.go
+++ b/service/fsx/go_module_metadata.go
@@ -3,4 +3,4 @@
 package fsx
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.51.7"
+const goModuleVersion = "1.51.8"
diff --git a/service/gamelift/CHANGELOG.md b/service/gamelift/CHANGELOG.md
index f420e2daf8c..f093eba6a1b 100644
--- a/service/gamelift/CHANGELOG.md
+++ b/service/gamelift/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.39.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.39.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/gamelift/go.mod b/service/gamelift/go.mod
index fc03d16776d..94d252a23a3 100644
--- a/service/gamelift/go.mod
+++ b/service/gamelift/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/gamelift
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/gamelift/go_module_metadata.go b/service/gamelift/go_module_metadata.go
index 8ed2038bda3..0d8c0d46475 100644
--- a/service/gamelift/go_module_metadata.go
+++ b/service/gamelift/go_module_metadata.go
@@ -3,4 +3,4 @@
 package gamelift
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.39.4"
+const goModuleVersion = "1.39.5"
diff --git a/service/geomaps/CHANGELOG.md b/service/geomaps/CHANGELOG.md
index e43cb6f8dca..485c3cf79aa 100644
--- a/service/geomaps/CHANGELOG.md
+++ b/service/geomaps/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/geomaps/go.mod b/service/geomaps/go.mod
index 377a05b1a3d..e699aa1d6c8 100644
--- a/service/geomaps/go.mod
+++ b/service/geomaps/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/geomaps
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/geomaps/go_module_metadata.go b/service/geomaps/go_module_metadata.go
index e4694e03002..5162b86734a 100644
--- a/service/geomaps/go_module_metadata.go
+++ b/service/geomaps/go_module_metadata.go
@@ -3,4 +3,4 @@
 package geomaps
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.10"
+const goModuleVersion = "1.0.11"
diff --git a/service/geoplaces/CHANGELOG.md b/service/geoplaces/CHANGELOG.md
index 45ea8981c48..a029b6711b6 100644
--- a/service/geoplaces/CHANGELOG.md
+++ b/service/geoplaces/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/geoplaces/go.mod b/service/geoplaces/go.mod
index 5a205653f93..8613332e0ed 100644
--- a/service/geoplaces/go.mod
+++ b/service/geoplaces/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/geoplaces
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/geoplaces/go_module_metadata.go b/service/geoplaces/go_module_metadata.go
index 6b952c40d32..1f9b7357223 100644
--- a/service/geoplaces/go_module_metadata.go
+++ b/service/geoplaces/go_module_metadata.go
@@ -3,4 +3,4 @@
 package geoplaces
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.10"
+const goModuleVersion = "1.0.11"
diff --git a/service/georoutes/CHANGELOG.md b/service/georoutes/CHANGELOG.md
index 6c38e62acb8..47a7d177cc6 100644
--- a/service/georoutes/CHANGELOG.md
+++ b/service/georoutes/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.1.0 (2025-01-31)
+
+* **Feature**: The OptimizeWaypoints API now supports 50 waypoints per request (20 with constraints like AccessHours or AppointmentTime). It adds waypoint clustering via Clustering and ClusteringIndex for better optimization. Also, total distance validation is removed for greater flexibility.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/georoutes/api_op_CalculateIsolines.go b/service/georoutes/api_op_CalculateIsolines.go
index 5f116601816..705673d00c3 100644
--- a/service/georoutes/api_op_CalculateIsolines.go
+++ b/service/georoutes/api_op_CalculateIsolines.go
@@ -33,10 +33,16 @@ type CalculateIsolinesInput struct {
 	// Threshold to be used for the isoline calculation. Up to 3 thresholds per
 	// provided type can be requested.
 	//
+	// You incur a calculation charge for each threshold. Using a large amount of
+	// thresholds in a request can lead you to incur unexpected charges. See [Amazon Location's pricing page]for more
+	// information.
+	//
+	// [Amazon Location's pricing page]: https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`
+	//
 	// This member is required.
 	Thresholds *types.IsolineThresholds
 
-	// Features that are allowed while calculating. a route
+	// Features that are allowed while calculating an isoline.
 	Allow *types.IsolineAllowOptions
 
 	// Time of arrival at the destination.
@@ -82,7 +88,7 @@ type CalculateIsolinesInput struct {
 	// Default Value: FlexiblePolyline
 	IsolineGeometryFormat types.GeometryFormat
 
-	// Defines the granularity of the returned Isoline
+	// Defines the granularity of the returned Isoline.
 	IsolineGranularity *types.IsolineGranularityOptions
 
 	// Optional: The API key to be used for authorization. Either an API key or valid
diff --git a/service/georoutes/api_op_CalculateRouteMatrix.go b/service/georoutes/api_op_CalculateRouteMatrix.go
index a693c65c92e..24800f4881d 100644
--- a/service/georoutes/api_op_CalculateRouteMatrix.go
+++ b/service/georoutes/api_op_CalculateRouteMatrix.go
@@ -11,7 +11,8 @@ import (
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
-// Calculates route matrix containing the results for all pairs of Origins to
+//	Use CalculateRouteMatrix to compute results for all pairs of Origins to
+//
 // Destinations. Each row corresponds to one entry in Origins. Each entry in the
 // row corresponds to the route from that entry in Origins to an entry in
 // Destinations positions.
@@ -34,11 +35,23 @@ type CalculateRouteMatrixInput struct {
 
 	// List of destinations for the route.
 	//
+	// Route calculations are billed for each origin and destination pair. If you use
+	// a large matrix of origins and destinations, your costs will increase
+	// accordingly. See [Amazon Location's pricing page]for more information.
+	//
+	// [Amazon Location's pricing page]: https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`
+	//
 	// This member is required.
 	Destinations []types.RouteMatrixDestination
 
 	// The position in longitude and latitude for the origin.
 	//
+	// Route calculations are billed for each origin and destination pair. Using a
+	// large amount of Origins in a request can lead you to incur unexpected charges.
+	// See [Amazon Location's pricing page]for more information.
+	//
+	// [Amazon Location's pricing page]: https://docs.aws.amazon.com/location/latest/developerguide/routes-pricing.html`
+	//
 	// This member is required.
 	Origins []types.RouteMatrixOrigin
 
@@ -51,7 +64,7 @@ type CalculateRouteMatrixInput struct {
 	// This member is required.
 	RoutingBoundary *types.RouteMatrixBoundary
 
-	// Features that are allowed while calculating. a route
+	// Features that are allowed while calculating a route.
 	Allow *types.RouteMatrixAllowOptions
 
 	// Features that are avoided while calculating a route. Avoidance is on a
diff --git a/service/georoutes/api_op_CalculateRoutes.go b/service/georoutes/api_op_CalculateRoutes.go
index 0a13dd2120c..a3c1da1736d 100644
--- a/service/georoutes/api_op_CalculateRoutes.go
+++ b/service/georoutes/api_op_CalculateRoutes.go
@@ -11,8 +11,8 @@ import (
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
-// Calculates a route given the following required parameters: Origin and
-// Destination .
+// CalculateRoutes computes routes given the following required parameters: Origin
+// and Destination .
 func (c *Client) CalculateRoutes(ctx context.Context, params *CalculateRoutesInput, optFns ...func(*Options)) (*CalculateRoutesOutput, error) {
 	if params == nil {
 		params = &CalculateRoutesInput{}
@@ -41,7 +41,7 @@ type CalculateRoutesInput struct {
 	// This member is required.
 	Origin []float64
 
-	// Features that are allowed while calculating. a route
+	// Features that are allowed while calculating a route.
 	Allow *types.RouteAllowOptions
 
 	// Time of arrival at the destination.
@@ -167,7 +167,7 @@ type CalculateRoutesInput struct {
 
 	// Type of step returned by the response. Default provides basic steps intended
 	// for web based applications. TurnByTurn provides detailed instructions with more
-	// granularity intended for a turn based naviagtion system.
+	// granularity intended for a turn based navigation system.
 	TravelStepType types.RouteTravelStepType
 
 	// List of waypoints between the Origin and Destination.
diff --git a/service/georoutes/api_op_OptimizeWaypoints.go b/service/georoutes/api_op_OptimizeWaypoints.go
index 68cd9bc8fc0..157507b963e 100644
--- a/service/georoutes/api_op_OptimizeWaypoints.go
+++ b/service/georoutes/api_op_OptimizeWaypoints.go
@@ -11,9 +11,9 @@ import (
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
-// Calculates the optimal order to travel between a set of waypoints to minimize
-// either the travel time or the distance travelled during the journey, based on
-// road network restrictions and the traffic pattern data.
+// OptimizeWaypoints calculates the optimal order to travel between a set of
+// waypoints to minimize either the travel time or the distance travelled during
+// the journey, based on road network restrictions and the traffic pattern data.
 func (c *Client) OptimizeWaypoints(ctx context.Context, params *OptimizeWaypointsInput, optFns ...func(*Options)) (*OptimizeWaypointsOutput, error) {
 	if params == nil {
 		params = &OptimizeWaypointsInput{}
@@ -36,11 +36,14 @@ type OptimizeWaypointsInput struct {
 	// This member is required.
 	Origin []float64
 
-	// Features that are avoided while calculating a route. Avoidance is on a
-	// best-case basis. If an avoidance can't be satisfied for a particular case, this
-	// setting is ignored.
+	// Features that are avoided. Avoidance is on a best-case basis. If an avoidance
+	// can't be satisfied for a particular case, this setting is ignored.
 	Avoid *types.WaypointOptimizationAvoidanceOptions
 
+	// Clustering allows you to specify how nearby waypoints can be clustered to
+	// improve the optimized sequence.
+	Clustering *types.WaypointOptimizationClusteringOptions
+
 	// Departure time from the waypoint.
 	//
 	// Time format: YYYY-MM-DDThh:mm:ss.sssZ | YYYY-MM-DDThh:mm:ss.sss+hh:mm
diff --git a/service/georoutes/api_op_SnapToRoads.go b/service/georoutes/api_op_SnapToRoads.go
index 3c281d024cf..e776a0a3d26 100644
--- a/service/georoutes/api_op_SnapToRoads.go
+++ b/service/georoutes/api_op_SnapToRoads.go
@@ -11,7 +11,7 @@ import (
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
-// The SnapToRoads action matches GPS trace to roads most likely traveled on.
+// SnapToRoads matches GPS trace to roads most likely traveled on.
 func (c *Client) SnapToRoads(ctx context.Context, params *SnapToRoadsInput, optFns ...func(*Options)) (*SnapToRoadsOutput, error) {
 	if params == nil {
 		params = &SnapToRoadsInput{}
diff --git a/service/georoutes/deserializers.go b/service/georoutes/deserializers.go
index fcdce27f503..a53f5aa1363 100644
--- a/service/georoutes/deserializers.go
+++ b/service/georoutes/deserializers.go
@@ -9627,6 +9627,19 @@ func awsRestjson1_deserializeDocumentWaypointOptimizationOptimizedWaypoint(v **t
 				sv.ArrivalTime = ptr.String(jtv)
 			}
 
+		case "ClusterIndex":
+			if value != nil {
+				jtv, ok := value.(json.Number)
+				if !ok {
+					return fmt.Errorf("expected ClusterIndex to be json.Number, got %T instead", value)
+				}
+				i64, err := jtv.Int64()
+				if err != nil {
+					return err
+				}
+				sv.ClusterIndex = ptr.Int32(int32(i64))
+			}
+
 		case "DepartureTime":
 			if value != nil {
 				jtv, ok := value.(string)
diff --git a/service/georoutes/go.mod b/service/georoutes/go.mod
index af7ce06d25a..3d80c16bbdf 100644
--- a/service/georoutes/go.mod
+++ b/service/georoutes/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/georoutes
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/georoutes/go_module_metadata.go b/service/georoutes/go_module_metadata.go
index 7b750b2e434..e15c5d9b0b6 100644
--- a/service/georoutes/go_module_metadata.go
+++ b/service/georoutes/go_module_metadata.go
@@ -3,4 +3,4 @@
 package georoutes
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.10"
+const goModuleVersion = "1.1.0"
diff --git a/service/georoutes/serializers.go b/service/georoutes/serializers.go
index af23940db9c..ddd3956f4e2 100644
--- a/service/georoutes/serializers.go
+++ b/service/georoutes/serializers.go
@@ -687,6 +687,13 @@ func awsRestjson1_serializeOpDocumentOptimizeWaypointsInput(v *OptimizeWaypoints
 		}
 	}
 
+	if v.Clustering != nil {
+		ok := object.Key("Clustering")
+		if err := awsRestjson1_serializeDocumentWaypointOptimizationClusteringOptions(v.Clustering, ok); err != nil {
+			return err
+		}
+	}
+
 	if v.DepartureTime != nil {
 		ok := object.Key("DepartureTime")
 		ok.String(*v.DepartureTime)
@@ -3670,6 +3677,25 @@ func awsRestjson1_serializeDocumentWaypointOptimizationAvoidanceOptions(v *types
 	return nil
 }
 
+func awsRestjson1_serializeDocumentWaypointOptimizationClusteringOptions(v *types.WaypointOptimizationClusteringOptions, value smithyjson.Value) error {
+	object := value.Object()
+	defer object.Close()
+
+	if len(v.Algorithm) > 0 {
+		ok := object.Key("Algorithm")
+		ok.String(string(v.Algorithm))
+	}
+
+	if v.DrivingDistanceOptions != nil {
+		ok := object.Key("DrivingDistanceOptions")
+		if err := awsRestjson1_serializeDocumentWaypointOptimizationDrivingDistanceOptions(v.DrivingDistanceOptions, ok); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func awsRestjson1_serializeDocumentWaypointOptimizationDestinationOptions(v *types.WaypointOptimizationDestinationOptions, value smithyjson.Value) error {
 	object := value.Object()
 	defer object.Close()
@@ -3750,6 +3776,18 @@ func awsRestjson1_serializeDocumentWaypointOptimizationDriverOptions(v *types.Wa
 	return nil
 }
 
+func awsRestjson1_serializeDocumentWaypointOptimizationDrivingDistanceOptions(v *types.WaypointOptimizationDrivingDistanceOptions, value smithyjson.Value) error {
+	object := value.Object()
+	defer object.Close()
+
+	{
+		ok := object.Key("DrivingDistance")
+		ok.Long(v.DrivingDistance)
+	}
+
+	return nil
+}
+
 func awsRestjson1_serializeDocumentWaypointOptimizationExclusionOptions(v *types.WaypointOptimizationExclusionOptions, value smithyjson.Value) error {
 	object := value.Object()
 	defer object.Close()
diff --git a/service/georoutes/types/enums.go b/service/georoutes/types/enums.go
index db5c36be218..9c47a55dcf5 100644
--- a/service/georoutes/types/enums.go
+++ b/service/georoutes/types/enums.go
@@ -411,6 +411,7 @@ const (
 	RouteFerryNoticeCodeOther                       RouteFerryNoticeCode = "Other"
 	RouteFerryNoticeCodeViolatedAvoidFerry          RouteFerryNoticeCode = "ViolatedAvoidFerry"
 	RouteFerryNoticeCodeViolatedAvoidRailFerry      RouteFerryNoticeCode = "ViolatedAvoidRailFerry"
+	RouteFerryNoticeCodeSeasonalClosure             RouteFerryNoticeCode = "SeasonalClosure"
 )
 
 // Values returns all known values for RouteFerryNoticeCode. Note that this can be
@@ -424,6 +425,7 @@ func (RouteFerryNoticeCode) Values() []RouteFerryNoticeCode {
 		"Other",
 		"ViolatedAvoidFerry",
 		"ViolatedAvoidRailFerry",
+		"SeasonalClosure",
 	}
 }
 
@@ -522,11 +524,12 @@ type RouteLegTravelMode string
 
 // Enum values for RouteLegTravelMode
 const (
-	RouteLegTravelModeCar        RouteLegTravelMode = "Car"
-	RouteLegTravelModeFerry      RouteLegTravelMode = "Ferry"
-	RouteLegTravelModePedestrian RouteLegTravelMode = "Pedestrian"
-	RouteLegTravelModeScooter    RouteLegTravelMode = "Scooter"
-	RouteLegTravelModeTruck      RouteLegTravelMode = "Truck"
+	RouteLegTravelModeCar             RouteLegTravelMode = "Car"
+	RouteLegTravelModeFerry           RouteLegTravelMode = "Ferry"
+	RouteLegTravelModePedestrian      RouteLegTravelMode = "Pedestrian"
+	RouteLegTravelModeScooter         RouteLegTravelMode = "Scooter"
+	RouteLegTravelModeTruck           RouteLegTravelMode = "Truck"
+	RouteLegTravelModeCarShuttleTrain RouteLegTravelMode = "CarShuttleTrain"
 )
 
 // Values returns all known values for RouteLegTravelMode. Note that this can be
@@ -540,6 +543,7 @@ func (RouteLegTravelMode) Values() []RouteLegTravelMode {
 		"Pedestrian",
 		"Scooter",
 		"Truck",
+		"CarShuttleTrain",
 	}
 }
 
@@ -1564,6 +1568,26 @@ func (ValidationExceptionReason) Values() []ValidationExceptionReason {
 	}
 }
 
+type WaypointOptimizationClusteringAlgorithm string
+
+// Enum values for WaypointOptimizationClusteringAlgorithm
+const (
+	WaypointOptimizationClusteringAlgorithmDrivingDistance WaypointOptimizationClusteringAlgorithm = "DrivingDistance"
+	WaypointOptimizationClusteringAlgorithmTopologySegment WaypointOptimizationClusteringAlgorithm = "TopologySegment"
+)
+
+// Values returns all known values for WaypointOptimizationClusteringAlgorithm.
+// Note that this can be expanded in the future, and so it is only as up to date as
+// the client.
+//
+// The ordering of this slice is not guaranteed to be stable across updates.
+func (WaypointOptimizationClusteringAlgorithm) Values() []WaypointOptimizationClusteringAlgorithm {
+	return []WaypointOptimizationClusteringAlgorithm{
+		"DrivingDistance",
+		"TopologySegment",
+	}
+}
+
 type WaypointOptimizationConstraint string
 
 // Enum values for WaypointOptimizationConstraint
diff --git a/service/georoutes/types/types.go b/service/georoutes/types/types.go
index f4568a761f9..8ce286bcd25 100644
--- a/service/georoutes/types/types.go
+++ b/service/georoutes/types/types.go
@@ -72,13 +72,17 @@ type Isoline struct {
 	noSmithyDocumentSerde
 }
 
-// Features that are allowed while calculating. a route
+// Features that are allowed while calculating an isoline.
 type IsolineAllowOptions struct {
 
-	// Allow Hot (High Occupancy Toll) lanes while calculating the route.
+	// Allow Hot (High Occupancy Toll) lanes while calculating an isoline.
+	//
+	// Default value: false
 	Hot *bool
 
-	// Allow Hov (High Occupancy vehicle) lanes while calculating the route.
+	// Allow Hov (High Occupancy vehicle) lanes while calculating an isoline.
+	//
+	// Default value: false
 	Hov *bool
 
 	noSmithyDocumentSerde
@@ -93,13 +97,13 @@ type IsolineAvoidanceArea struct {
 	Geometry *IsolineAvoidanceAreaGeometry
 
 	// Exceptions to the provided avoidance geometry, to be included while calculating
-	// the route.
+	// an isoline.
 	Except []IsolineAvoidanceAreaGeometry
 
 	noSmithyDocumentSerde
 }
 
-// The avoidance geometry, to be included while calculating the route.
+// The avoidance geometry, to be included while calculating an isoline.
 type IsolineAvoidanceAreaGeometry struct {
 
 	// Geometry defined as a bounding box. The first pair represents the X and Y
@@ -132,7 +136,7 @@ type IsolineAvoidanceAreaGeometry struct {
 	noSmithyDocumentSerde
 }
 
-// Features that are avoided while calculating a route. Avoidance is on a
+// Features that are avoided while calculating isolines. Avoidance is on a
 // best-case basis. If an avoidance can't be satisfied for a particular case, it
 // violates the avoidance and the returned response produces a notice for the
 // violation.
@@ -141,19 +145,19 @@ type IsolineAvoidanceOptions struct {
 	// Areas to be avoided.
 	Areas []IsolineAvoidanceArea
 
-	// Avoid car-shuttle-trains while calculating the route.
+	// Avoid car-shuttle-trains while calculating an isoline.
 	CarShuttleTrains *bool
 
-	// Avoid controlled access highways while calculating the route.
+	// Avoid controlled access highways while calculating an isoline.
 	ControlledAccessHighways *bool
 
-	// Avoid dirt roads while calculating the route.
+	// Avoid dirt roads while calculating an isoline.
 	DirtRoads *bool
 
-	// Avoid ferries while calculating the route.
+	// Avoid ferries while calculating an isoline.
 	Ferries *bool
 
-	// Avoid roads that have seasonal closure while calculating the route.
+	// Avoid roads that have seasonal closure while calculating an isoline.
 	SeasonalClosure *bool
 
 	// Avoids roads where the specified toll transponders are the only mode of payment.
@@ -168,7 +172,7 @@ type IsolineAvoidanceOptions struct {
 	// There are currently no other supported values as of 26th April 2024.
 	TruckRoadTypes []string
 
-	// Avoid tunnels while calculating the route.
+	// Avoid tunnels while calculating an isoline.
 	Tunnels *bool
 
 	// Avoid U-turns for calculation on highways and motorways.
@@ -189,7 +193,7 @@ type IsolineAvoidanceZoneCategory struct {
 	noSmithyDocumentSerde
 }
 
-// Options for vehicles.
+// Travel mode options when the provided travel mode is Car .
 type IsolineCarOptions struct {
 
 	// Engine type of the vehicle.
@@ -236,7 +240,7 @@ type IsolineConnection struct {
 	noSmithyDocumentSerde
 }
 
-// Geometry of the connection between different Isoline components.
+// Geometry of the connection between different isoline components.
 type IsolineConnectionGeometry struct {
 
 	// An ordered list of positions used to plot a route on a map.
@@ -281,7 +285,7 @@ type IsolineGranularityOptions struct {
 
 	// Maximum resolution of the returned isoline.
 	//
-	// Unit: centimeters
+	// Unit: meters
 	MaxResolution int64
 
 	noSmithyDocumentSerde
@@ -314,7 +318,7 @@ type IsolineMatchingOptions struct {
 	noSmithyDocumentSerde
 }
 
-// Options for the property.
+// Origin related options.
 type IsolineOriginOptions struct {
 
 	// Avoids actions for the provided distance. This is typically to consider for
@@ -334,7 +338,7 @@ type IsolineOriginOptions struct {
 	noSmithyDocumentSerde
 }
 
-// Options for the property.
+// Travel mode options when the provided travel mode is Scooter
 type IsolineScooterOptions struct {
 
 	// Engine type of the vehicle.
@@ -392,7 +396,7 @@ type IsolineSideOfStreetOptions struct {
 	noSmithyDocumentSerde
 }
 
-// Threshold to be used for the isoline calculation. Up to 3 thresholds per
+// Threshold to be used for the isoline calculation. Up to 5 thresholds per
 // provided type can be requested.
 type IsolineThresholds struct {
 
@@ -445,7 +449,10 @@ type IsolineTravelModeOptions struct {
 	// Travel mode options when the provided travel mode is "Car"
 	Car *IsolineCarOptions
 
-	// Travel mode options when the provided travel mode is "Scooter"
+	// Travel mode options when the provided travel mode is Scooter
+	//
+	// When travel mode is set to Scooter , then the avoidance option
+	// ControlledAccessHighways defaults to true .
 	Scooter *IsolineScooterOptions
 
 	// Travel mode options when the provided travel mode is "Truck"
@@ -807,13 +814,17 @@ type Route struct {
 	noSmithyDocumentSerde
 }
 
-// Features that are allowed while calculating. a route
+// Features that are allowed while calculating a route.
 type RouteAllowOptions struct {
 
 	// Allow Hot (High Occupancy Toll) lanes while calculating the route.
+	//
+	// Default value: false
 	Hot *bool
 
 	// Allow Hov (High Occupancy vehicle) lanes while calculating the route.
+	//
+	// Default value: false
 	Hov *bool
 
 	noSmithyDocumentSerde
@@ -865,7 +876,11 @@ type RouteAvoidanceAreaGeometry struct {
 	noSmithyDocumentSerde
 }
 
-// Options related to areas to be avoided.
+// Specifies options for areas to avoid when calculating the route. This is a
+// best-effort avoidance setting, meaning the router will try to honor the
+// avoidance preferences but may still include restricted areas if no feasible
+// alternative route exists. If avoidance options are not followed, the response
+// will indicate that the avoidance criteria were violated.
 type RouteAvoidanceOptions struct {
 
 	// Areas to be avoided.
@@ -921,7 +936,7 @@ type RouteAvoidanceZoneCategory struct {
 	noSmithyDocumentSerde
 }
 
-// Travel mode options when the provided travel mode is "Car"
+// Travel mode options when the provided travel mode is Car .
 type RouteCarOptions struct {
 
 	// Engine type of the vehicle.
@@ -1070,7 +1085,9 @@ type RouteEnterHighwayStepDetails struct {
 	noSmithyDocumentSerde
 }
 
-// Exclusion options for the route.
+// Specifies strict exclusion options for the route calculation. This setting
+// mandates that the router will avoid any routes that include the specified
+// options, rather than merely attempting to minimize them.
 type RouteExclusionOptions struct {
 
 	// List of countries to be avoided defined by two-letter or three-letter country
@@ -1296,6 +1313,8 @@ type RouteFerrySpan struct {
 
 	// Distance of the computed span. This feature doesn't split a span, but is always
 	// computed on a span split by other properties.
+	//
+	// Unit: meters
 	Distance int64
 
 	// Duration of the computed span. This feature doesn't split a span, but is always
@@ -1500,9 +1519,13 @@ type RouteMatchingOptions struct {
 type RouteMatrixAllowOptions struct {
 
 	// Allow Hot (High Occupancy Toll) lanes while calculating the route.
+	//
+	// Default value: false
 	Hot *bool
 
 	// Allow Hov (High Occupancy vehicle) lanes while calculating the route.
+	//
+	// Default value: false
 	Hov *bool
 
 	noSmithyDocumentSerde
@@ -1554,7 +1577,11 @@ type RouteMatrixAvoidanceAreaGeometry struct {
 	noSmithyDocumentSerde
 }
 
-// Options related to the route matrix.
+// Specifies options for areas to avoid when calculating the route. This is a
+// best-effort avoidance setting, meaning the router will try to honor the
+// avoidance preferences but may still include restricted areas if no feasible
+// alternative route exists. If avoidance options are not followed, the response
+// will indicate that the avoidance criteria were violated.
 type RouteMatrixAvoidanceOptions struct {
 
 	// Areas to be avoided.
@@ -1642,7 +1669,7 @@ type RouteMatrixBoundaryGeometry struct {
 	noSmithyDocumentSerde
 }
 
-// Options related to the car.
+// Travel mode options when the provided travel mode is Car .
 type RouteMatrixCarOptions struct {
 
 	// The vehicle License Plate.
@@ -1719,7 +1746,9 @@ type RouteMatrixEntry struct {
 	noSmithyDocumentSerde
 }
 
-// Exclusion options.
+// Specifies strict exclusion options for the route calculation. This setting
+// mandates that the router will avoid any routes that include the specified
+// options, rather than merely attempting to minimize them.
 type RouteMatrixExclusionOptions struct {
 
 	// List of countries to be avoided defined by two-letter or three-letter country
@@ -1792,7 +1821,7 @@ type RouteMatrixOriginOptions struct {
 	noSmithyDocumentSerde
 }
 
-// Travel mode options when the provided travel mode is "Scooter"
+// Travel mode options when the provided travel mode is Scooter
 type RouteMatrixScooterOptions struct {
 
 	// The vehicle License Plate.
@@ -1863,7 +1892,10 @@ type RouteMatrixTravelModeOptions struct {
 	// Travel mode options when the provided travel mode is "Car"
 	Car *RouteMatrixCarOptions
 
-	// Travel mode options when the provided travel mode is "Scooter"
+	// Travel mode options when the provided travel mode is Scooter
+	//
+	// When travel mode is set to Scooter , then the avoidance option
+	// ControlledAccessHighways defaults to true .
 	Scooter *RouteMatrixScooterOptions
 
 	// Travel mode options when the provided travel mode is "Truck"
@@ -2490,7 +2522,7 @@ type RouteRoundaboutPassStepDetails struct {
 	noSmithyDocumentSerde
 }
 
-// Travel mode options when the provided travel mode is "Scooter"
+// Travel mode options when the provided travel mode is Scooter
 type RouteScooterOptions struct {
 
 	// Engine type of the vehicle.
@@ -2904,7 +2936,10 @@ type RouteTravelModeOptions struct {
 	// Travel mode options when the provided travel mode is "Pedestrian"
 	Pedestrian *RoutePedestrianOptions
 
-	// Travel mode options when the provided travel mode is "Scooter"
+	// Travel mode options when the provided travel mode is Scooter
+	//
+	// When travel mode is set to Scooter , then the avoidance option
+	// ControlledAccessHighways defaults to true .
 	Scooter *RouteScooterOptions
 
 	// Travel mode options when the provided travel mode is "Truck"
@@ -3745,7 +3780,11 @@ type WaypointOptimizationAvoidanceAreaGeometry struct {
 	noSmithyDocumentSerde
 }
 
-// Options for WaypointOptimizationAvoidance.
+// Specifies options for areas to avoid. This is a best-effort avoidance setting,
+// meaning the router will try to honor the avoidance preferences but may still
+// include restricted areas if no feasible alternative route exists. If avoidance
+// options are not followed, the response will indicate that the avoidance criteria
+// were violated.
 type WaypointOptimizationAvoidanceOptions struct {
 
 	// Areas to be avoided.
@@ -3775,6 +3814,25 @@ type WaypointOptimizationAvoidanceOptions struct {
 	noSmithyDocumentSerde
 }
 
+// Options for WaypointOptimizationClustering.
+type WaypointOptimizationClusteringOptions struct {
+
+	// The algorithm to be used. DrivingDistance assigns all the waypoints that are
+	// within driving distance of each other into a single cluster. TopologySegment
+	// assigns all the waypoints that are within the same topology segment into a
+	// single cluster. A Topology segment is a linear stretch of road between two
+	// junctions.
+	//
+	// This member is required.
+	Algorithm WaypointOptimizationClusteringAlgorithm
+
+	// Driving distance options to be used when the clustering algorithm is
+	// DrivingDistance.
+	DrivingDistanceOptions *WaypointOptimizationDrivingDistanceOptions
+
+	noSmithyDocumentSerde
+}
+
 // This contains information such as distance and duration from one waypoint to
 // the next waypoint in the sequence.
 type WaypointOptimizationConnection struct {
@@ -3864,7 +3922,21 @@ type WaypointOptimizationDriverOptions struct {
 	noSmithyDocumentSerde
 }
 
-// Exclusion options.
+// Driving distance related options.
+type WaypointOptimizationDrivingDistanceOptions struct {
+
+	// DrivingDistance assigns all the waypoints that are within driving distance of
+	// each other into a single cluster.
+	//
+	// This member is required.
+	DrivingDistance int64
+
+	noSmithyDocumentSerde
+}
+
+// Specifies strict exclusion options for the route calculation. This setting
+// mandates that the router will avoid any routes that include the specified
+// options, rather than merely attempting to minimize them.
 type WaypointOptimizationExclusionOptions struct {
 
 	// List of countries to be avoided defined by two-letter or three-letter country
@@ -3946,10 +4018,14 @@ type WaypointOptimizationOptimizedWaypoint struct {
 	//     2020-04-22T17:57:24+02:00
 	ArrivalTime *string
 
+	// Index of the cluster the waypoint is associated with. The index is included in
+	// the response only if clustering was performed while processing the request.
+	ClusterIndex *int32
+
 	noSmithyDocumentSerde
 }
 
-// Options related to the origin.
+// Origin related options.
 type WaypointOptimizationOriginOptions struct {
 
 	// The Origin Id.
diff --git a/service/georoutes/validators.go b/service/georoutes/validators.go
index b67dd3b128f..c7f4fbf29b8 100644
--- a/service/georoutes/validators.go
+++ b/service/georoutes/validators.go
@@ -989,6 +989,26 @@ func validateWaypointOptimizationAvoidanceOptions(v *types.WaypointOptimizationA
 	}
 }
 
+func validateWaypointOptimizationClusteringOptions(v *types.WaypointOptimizationClusteringOptions) error {
+	if v == nil {
+		return nil
+	}
+	invalidParams := smithy.InvalidParamsError{Context: "WaypointOptimizationClusteringOptions"}
+	if len(v.Algorithm) == 0 {
+		invalidParams.Add(smithy.NewErrParamRequired("Algorithm"))
+	}
+	if v.DrivingDistanceOptions != nil {
+		if err := validateWaypointOptimizationDrivingDistanceOptions(v.DrivingDistanceOptions); err != nil {
+			invalidParams.AddNested("DrivingDistanceOptions", err.(smithy.InvalidParamsError))
+		}
+	}
+	if invalidParams.Len() > 0 {
+		return invalidParams
+	} else {
+		return nil
+	}
+}
+
 func validateWaypointOptimizationDestinationOptions(v *types.WaypointOptimizationDestinationOptions) error {
 	if v == nil {
 		return nil
@@ -1033,6 +1053,18 @@ func validateWaypointOptimizationDriverOptions(v *types.WaypointOptimizationDriv
 	}
 }
 
+func validateWaypointOptimizationDrivingDistanceOptions(v *types.WaypointOptimizationDrivingDistanceOptions) error {
+	if v == nil {
+		return nil
+	}
+	invalidParams := smithy.InvalidParamsError{Context: "WaypointOptimizationDrivingDistanceOptions"}
+	if invalidParams.Len() > 0 {
+		return invalidParams
+	} else {
+		return nil
+	}
+}
+
 func validateWaypointOptimizationExclusionOptions(v *types.WaypointOptimizationExclusionOptions) error {
 	if v == nil {
 		return nil
@@ -1294,6 +1326,11 @@ func validateOpOptimizeWaypointsInput(v *OptimizeWaypointsInput) error {
 			invalidParams.AddNested("Avoid", err.(smithy.InvalidParamsError))
 		}
 	}
+	if v.Clustering != nil {
+		if err := validateWaypointOptimizationClusteringOptions(v.Clustering); err != nil {
+			invalidParams.AddNested("Clustering", err.(smithy.InvalidParamsError))
+		}
+	}
 	if v.DestinationOptions != nil {
 		if err := validateWaypointOptimizationDestinationOptions(v.DestinationOptions); err != nil {
 			invalidParams.AddNested("DestinationOptions", err.(smithy.InvalidParamsError))
diff --git a/service/glacier/CHANGELOG.md b/service/glacier/CHANGELOG.md
index 1acf224277a..d7e9b69ac47 100644
--- a/service/glacier/CHANGELOG.md
+++ b/service/glacier/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/glacier/go.mod b/service/glacier/go.mod
index 0e7731a96bc..6336f4d4139 100644
--- a/service/glacier/go.mod
+++ b/service/glacier/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/glacier
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/glacier/go_module_metadata.go b/service/glacier/go_module_metadata.go
index 04f4f00c020..0049e0a9c54 100644
--- a/service/glacier/go_module_metadata.go
+++ b/service/glacier/go_module_metadata.go
@@ -3,4 +3,4 @@
 package glacier
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.14"
+const goModuleVersion = "1.26.15"
diff --git a/service/globalaccelerator/CHANGELOG.md b/service/globalaccelerator/CHANGELOG.md
index 8f2a2f4f5a0..338eca50260 100644
--- a/service/globalaccelerator/CHANGELOG.md
+++ b/service/globalaccelerator/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/globalaccelerator/go.mod b/service/globalaccelerator/go.mod
index 331b75b6405..4d0c6b0969a 100644
--- a/service/globalaccelerator/go.mod
+++ b/service/globalaccelerator/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/globalaccelerator
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/globalaccelerator/go_module_metadata.go b/service/globalaccelerator/go_module_metadata.go
index f3ad30a5306..693713cef90 100644
--- a/service/globalaccelerator/go_module_metadata.go
+++ b/service/globalaccelerator/go_module_metadata.go
@@ -3,4 +3,4 @@
 package globalaccelerator
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/glue/CHANGELOG.md b/service/glue/CHANGELOG.md
index 5954af8df80..8ae6b61c86b 100644
--- a/service/glue/CHANGELOG.md
+++ b/service/glue/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.105.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.105.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/glue/go.mod b/service/glue/go.mod
index e2a17a15858..f81e0d4e119 100644
--- a/service/glue/go.mod
+++ b/service/glue/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/glue
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/glue/go_module_metadata.go b/service/glue/go_module_metadata.go
index 74e12b28194..fc11102ffe5 100644
--- a/service/glue/go_module_metadata.go
+++ b/service/glue/go_module_metadata.go
@@ -3,4 +3,4 @@
 package glue
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.105.6"
+const goModuleVersion = "1.105.7"
diff --git a/service/grafana/CHANGELOG.md b/service/grafana/CHANGELOG.md
index a401d82e78e..c84cc39f6e8 100644
--- a/service/grafana/CHANGELOG.md
+++ b/service/grafana/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/grafana/go.mod b/service/grafana/go.mod
index 6200b96d6ae..be3137bca7a 100644
--- a/service/grafana/go.mod
+++ b/service/grafana/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/grafana
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/grafana/go_module_metadata.go b/service/grafana/go_module_metadata.go
index a2b42f323e0..ddb180bf251 100644
--- a/service/grafana/go_module_metadata.go
+++ b/service/grafana/go_module_metadata.go
@@ -3,4 +3,4 @@
 package grafana
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/greengrass/CHANGELOG.md b/service/greengrass/CHANGELOG.md
index 16fedfcbc58..08cfbdeb71a 100644
--- a/service/greengrass/CHANGELOG.md
+++ b/service/greengrass/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/greengrass/go.mod b/service/greengrass/go.mod
index 531d41dd615..0692400029f 100644
--- a/service/greengrass/go.mod
+++ b/service/greengrass/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/greengrass
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/greengrass/go_module_metadata.go b/service/greengrass/go_module_metadata.go
index fef0405cdec..0ce19437266 100644
--- a/service/greengrass/go_module_metadata.go
+++ b/service/greengrass/go_module_metadata.go
@@ -3,4 +3,4 @@
 package greengrass
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/greengrassv2/CHANGELOG.md b/service/greengrassv2/CHANGELOG.md
index 05dc4951e56..1887533f70a 100644
--- a/service/greengrassv2/CHANGELOG.md
+++ b/service/greengrassv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.36.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.36.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/greengrassv2/go.mod b/service/greengrassv2/go.mod
index 04125703d7c..5105373a092 100644
--- a/service/greengrassv2/go.mod
+++ b/service/greengrassv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/greengrassv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/greengrassv2/go_module_metadata.go b/service/greengrassv2/go_module_metadata.go
index abbc9b0c8d8..6e9388e8c2f 100644
--- a/service/greengrassv2/go_module_metadata.go
+++ b/service/greengrassv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package greengrassv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.36.6"
+const goModuleVersion = "1.36.7"
diff --git a/service/groundstation/CHANGELOG.md b/service/groundstation/CHANGELOG.md
index 142e8105d1a..95cca03d2ac 100644
--- a/service/groundstation/CHANGELOG.md
+++ b/service/groundstation/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.31.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/groundstation/api_op_DescribeContact.go b/service/groundstation/api_op_DescribeContact.go
index 9a4e055c75f..7c4a88dfc1a 100644
--- a/service/groundstation/api_op_DescribeContact.go
+++ b/service/groundstation/api_op_DescribeContact.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -367,35 +366,21 @@ func (w *ContactScheduledWaiter) WaitForOutput(ctx context.Context, params *Desc
 func contactScheduledStateRetryable(ctx context.Context, input *DescribeContactInput, output *DescribeContactOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("contactStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ContactStatus
 		expectedValue := "FAILED_TO_SCHEDULE"
-		value, ok := pathValue.(types.ContactStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ContactStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("contactStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ContactStatus
 		expectedValue := "SCHEDULED"
-		value, ok := pathValue.(types.ContactStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ContactStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/groundstation/generated.json b/service/groundstation/generated.json
index 568f2b66e09..b1c6eb52475 100644
--- a/service/groundstation/generated.json
+++ b/service/groundstation/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/groundstation/go.mod b/service/groundstation/go.mod
index 464b09eb2ac..aa808e3d968 100644
--- a/service/groundstation/go.mod
+++ b/service/groundstation/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/groundstation
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/groundstation/go.sum b/service/groundstation/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/groundstation/go.sum
+++ b/service/groundstation/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/groundstation/go_module_metadata.go b/service/groundstation/go_module_metadata.go
index b110ef4ad5a..4f5422fc061 100644
--- a/service/groundstation/go_module_metadata.go
+++ b/service/groundstation/go_module_metadata.go
@@ -3,4 +3,4 @@
 package groundstation
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.14"
+const goModuleVersion = "1.31.15"
diff --git a/service/guardduty/CHANGELOG.md b/service/guardduty/CHANGELOG.md
index a7f3e7bed93..97642a23de4 100644
--- a/service/guardduty/CHANGELOG.md
+++ b/service/guardduty/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.52.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.52.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/guardduty/go.mod b/service/guardduty/go.mod
index 9e7af50a555..f1e3f236d62 100644
--- a/service/guardduty/go.mod
+++ b/service/guardduty/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/guardduty
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/guardduty/go_module_metadata.go b/service/guardduty/go_module_metadata.go
index 3835f2ac15f..8b1e06c9da8 100644
--- a/service/guardduty/go_module_metadata.go
+++ b/service/guardduty/go_module_metadata.go
@@ -3,4 +3,4 @@
 package guardduty
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.52.7"
+const goModuleVersion = "1.52.8"
diff --git a/service/health/CHANGELOG.md b/service/health/CHANGELOG.md
index 7bff1c9d56b..635bedba9d3 100644
--- a/service/health/CHANGELOG.md
+++ b/service/health/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/health/go.mod b/service/health/go.mod
index 3f9b63c5711..c3287d4b84f 100644
--- a/service/health/go.mod
+++ b/service/health/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/health
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/health/go_module_metadata.go b/service/health/go_module_metadata.go
index b378e9436ac..a2f0e9f3916 100644
--- a/service/health/go_module_metadata.go
+++ b/service/health/go_module_metadata.go
@@ -3,4 +3,4 @@
 package health
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.7"
+const goModuleVersion = "1.29.8"
diff --git a/service/healthlake/CHANGELOG.md b/service/healthlake/CHANGELOG.md
index 651a96d8baa..0fa8ad6331f 100644
--- a/service/healthlake/CHANGELOG.md
+++ b/service/healthlake/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/healthlake/go.mod b/service/healthlake/go.mod
index b65e9e0597a..45a070f9ef0 100644
--- a/service/healthlake/go.mod
+++ b/service/healthlake/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/healthlake
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/healthlake/go_module_metadata.go b/service/healthlake/go_module_metadata.go
index e3246e7b132..9f9d12e2d98 100644
--- a/service/healthlake/go_module_metadata.go
+++ b/service/healthlake/go_module_metadata.go
@@ -3,4 +3,4 @@
 package healthlake
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.1"
+const goModuleVersion = "1.29.2"
diff --git a/service/iam/CHANGELOG.md b/service/iam/CHANGELOG.md
index f1496d7f76a..2090692e60f 100644
--- a/service/iam/CHANGELOG.md
+++ b/service/iam/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.38.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.38.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iam/go.mod b/service/iam/go.mod
index 1f4b0b71e55..367842cc331 100644
--- a/service/iam/go.mod
+++ b/service/iam/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iam
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iam/go_module_metadata.go b/service/iam/go_module_metadata.go
index ad16ad7739a..a70bbd12d9b 100644
--- a/service/iam/go_module_metadata.go
+++ b/service/iam/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iam
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.38.9"
+const goModuleVersion = "1.38.10"
diff --git a/service/identitystore/CHANGELOG.md b/service/identitystore/CHANGELOG.md
index 5640f4f1ceb..da74703303f 100644
--- a/service/identitystore/CHANGELOG.md
+++ b/service/identitystore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/identitystore/go.mod b/service/identitystore/go.mod
index e9d8b634465..91a60c0fb72 100644
--- a/service/identitystore/go.mod
+++ b/service/identitystore/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/identitystore
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/identitystore/go_module_metadata.go b/service/identitystore/go_module_metadata.go
index 5cc8327fce6..3a051fb41da 100644
--- a/service/identitystore/go_module_metadata.go
+++ b/service/identitystore/go_module_metadata.go
@@ -3,4 +3,4 @@
 package identitystore
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.14"
+const goModuleVersion = "1.27.15"
diff --git a/service/imagebuilder/CHANGELOG.md b/service/imagebuilder/CHANGELOG.md
index 9c7dd902d03..4d03eff2e8f 100644
--- a/service/imagebuilder/CHANGELOG.md
+++ b/service/imagebuilder/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.40.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.40.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/imagebuilder/go.mod b/service/imagebuilder/go.mod
index 69032438059..bee72a8e62d 100644
--- a/service/imagebuilder/go.mod
+++ b/service/imagebuilder/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/imagebuilder
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/imagebuilder/go_module_metadata.go b/service/imagebuilder/go_module_metadata.go
index 47d2997ad47..84484dbe98e 100644
--- a/service/imagebuilder/go_module_metadata.go
+++ b/service/imagebuilder/go_module_metadata.go
@@ -3,4 +3,4 @@
 package imagebuilder
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.40.5"
+const goModuleVersion = "1.40.6"
diff --git a/service/inspector/CHANGELOG.md b/service/inspector/CHANGELOG.md
index d9c2920967e..bd1c4be12c7 100644
--- a/service/inspector/CHANGELOG.md
+++ b/service/inspector/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/inspector/go.mod b/service/inspector/go.mod
index 0443e6a35f8..6b419639668 100644
--- a/service/inspector/go.mod
+++ b/service/inspector/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/inspector
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/inspector/go_module_metadata.go b/service/inspector/go_module_metadata.go
index 46e23270f58..3306adb4289 100644
--- a/service/inspector/go_module_metadata.go
+++ b/service/inspector/go_module_metadata.go
@@ -3,4 +3,4 @@
 package inspector
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/inspector2/CHANGELOG.md b/service/inspector2/CHANGELOG.md
index 2322b32dcae..47cb0cd1b79 100644
--- a/service/inspector2/CHANGELOG.md
+++ b/service/inspector2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/inspector2/go.mod b/service/inspector2/go.mod
index edf8fbac887..d028be1de3c 100644
--- a/service/inspector2/go.mod
+++ b/service/inspector2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/inspector2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/inspector2/go_module_metadata.go b/service/inspector2/go_module_metadata.go
index 4b3f0f9f1c6..c4f358ac793 100644
--- a/service/inspector2/go_module_metadata.go
+++ b/service/inspector2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package inspector2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.7"
+const goModuleVersion = "1.34.8"
diff --git a/service/inspectorscan/CHANGELOG.md b/service/inspectorscan/CHANGELOG.md
index 847140562c5..d619bc70d89 100644
--- a/service/inspectorscan/CHANGELOG.md
+++ b/service/inspectorscan/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/inspectorscan/go.mod b/service/inspectorscan/go.mod
index d69d4ab5e7e..0158144e98e 100644
--- a/service/inspectorscan/go.mod
+++ b/service/inspectorscan/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/inspectorscan
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/inspectorscan/go_module_metadata.go b/service/inspectorscan/go_module_metadata.go
index 8d53818a78d..afac50ca5bd 100644
--- a/service/inspectorscan/go_module_metadata.go
+++ b/service/inspectorscan/go_module_metadata.go
@@ -3,4 +3,4 @@
 package inspectorscan
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.13"
+const goModuleVersion = "1.7.14"
diff --git a/service/internal/benchmark/go.mod b/service/internal/benchmark/go.mod
index dcba99a140d..ab6d9a1f2f1 100644
--- a/service/internal/benchmark/go.mod
+++ b/service/internal/benchmark/go.mod
@@ -4,24 +4,24 @@ go 1.21
 
 require (
 	github.com/aws/aws-sdk-go v1.44.28
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
-	github.com/aws/aws-sdk-go-v2/service/lexruntimeservice v1.24.13
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.1
-	github.com/aws/aws-sdk-go-v2/service/schemas v1.28.15
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
+	github.com/aws/aws-sdk-go-v2/service/lexruntimeservice v1.24.14
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
+	github.com/aws/aws-sdk-go-v2/service/schemas v1.28.16
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
diff --git a/service/internal/checksum/CHANGELOG.md b/service/internal/checksum/CHANGELOG.md
index 53c51cb2d2a..8c53280f5f4 100644
--- a/service/internal/checksum/CHANGELOG.md
+++ b/service/internal/checksum/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.5.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.5.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internal/checksum/go.mod b/service/internal/checksum/go.mod
index 62232867dac..0f121faea7b 100644
--- a/service/internal/checksum/go.mod
+++ b/service/internal/checksum/go.mod
@@ -3,8 +3,8 @@ module github.com/aws/aws-sdk-go-v2/service/internal/checksum
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/internal/checksum/go_module_metadata.go b/service/internal/checksum/go_module_metadata.go
index c34648a18a0..2dac37218a7 100644
--- a/service/internal/checksum/go_module_metadata.go
+++ b/service/internal/checksum/go_module_metadata.go
@@ -3,4 +3,4 @@
 package checksum
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.5.4"
+const goModuleVersion = "1.5.5"
diff --git a/service/internal/endpoint-discovery/CHANGELOG.md b/service/internal/endpoint-discovery/CHANGELOG.md
index 8348fec9447..084d12505ba 100644
--- a/service/internal/endpoint-discovery/CHANGELOG.md
+++ b/service/internal/endpoint-discovery/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.10.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.10.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internal/endpoint-discovery/go.mod b/service/internal/endpoint-discovery/go.mod
index 94fa2be7c92..1276f4b2662 100644
--- a/service/internal/endpoint-discovery/go.mod
+++ b/service/internal/endpoint-discovery/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/internal/endpoint-discovery/go_module_metadata.go b/service/internal/endpoint-discovery/go_module_metadata.go
index bd648a980dc..e9e70162047 100644
--- a/service/internal/endpoint-discovery/go_module_metadata.go
+++ b/service/internal/endpoint-discovery/go_module_metadata.go
@@ -3,4 +3,4 @@
 package endpointdiscovery
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.10.11"
+const goModuleVersion = "1.10.12"
diff --git a/service/internal/eventstreamtesting/CHANGELOG.md b/service/internal/eventstreamtesting/CHANGELOG.md
index c6a2a0b8432..ef19ba968bf 100644
--- a/service/internal/eventstreamtesting/CHANGELOG.md
+++ b/service/internal/eventstreamtesting/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.5.18 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.5.17 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internal/eventstreamtesting/go.mod b/service/internal/eventstreamtesting/go.mod
index 3fcac27db26..f1344bea2fd 100644
--- a/service/internal/eventstreamtesting/go.mod
+++ b/service/internal/eventstreamtesting/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/internal/eventstreamtesting
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57
 )
 
 require github.com/aws/smithy-go v1.22.2 // indirect
diff --git a/service/internal/eventstreamtesting/go_module_metadata.go b/service/internal/eventstreamtesting/go_module_metadata.go
index 1e4b61fa509..1132fe0bc42 100644
--- a/service/internal/eventstreamtesting/go_module_metadata.go
+++ b/service/internal/eventstreamtesting/go_module_metadata.go
@@ -3,4 +3,4 @@
 package eventstreamtesting
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.5.17"
+const goModuleVersion = "1.5.18"
diff --git a/service/internal/integrationtest/go.mod b/service/internal/integrationtest/go.mod
index 7bebbfe5b49..6b74eeacff9 100644
--- a/service/internal/integrationtest/go.mod
+++ b/service/internal/integrationtest/go.mod
@@ -1,105 +1,104 @@
 module github.com/aws/aws-sdk-go-v2/service/internal/integrationtest
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.56
-	github.com/aws/aws-sdk-go-v2/service/acm v1.30.15
-	github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.9
-	github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.34.10
-	github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice v1.29.7
-	github.com/aws/aws-sdk-go-v2/service/appstream v1.43.0
-	github.com/aws/aws-sdk-go-v2/service/athena v1.49.7
-	github.com/aws/aws-sdk-go-v2/service/batch v1.49.9
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.9
-	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.7
-	github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.29.5
-	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.47.1
-	github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.11
-	github.com/aws/aws-sdk-go-v2/service/codebuild v1.50.4
-	github.com/aws/aws-sdk-go-v2/service/codecommit v1.27.13
-	github.com/aws/aws-sdk-go-v2/service/codedeploy v1.29.15
-	github.com/aws/aws-sdk-go-v2/service/codepipeline v1.38.6
-	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.49.2
-	github.com/aws/aws-sdk-go-v2/service/configservice v1.51.9
-	github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.28.13
-	github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.45.8
-	github.com/aws/aws-sdk-go-v2/service/devicefarm v1.28.13
-	github.com/aws/aws-sdk-go-v2/service/directconnect v1.30.9
-	github.com/aws/aws-sdk-go-v2/service/directoryservice v1.30.14
-	github.com/aws/aws-sdk-go-v2/service/docdb v1.40.7
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.7
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.1
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.40.0
-	github.com/aws/aws-sdk-go-v2/service/ecs v1.53.10
-	github.com/aws/aws-sdk-go-v2/service/efs v1.34.8
-	github.com/aws/aws-sdk-go-v2/service/elasticache v1.44.9
-	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.28.14
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.14
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.9
-	github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.32.15
-	github.com/aws/aws-sdk-go-v2/service/emr v1.47.9
-	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.8
-	github.com/aws/aws-sdk-go-v2/service/firehose v1.36.1
-	github.com/aws/aws-sdk-go-v2/service/gamelift v1.39.4
-	github.com/aws/aws-sdk-go-v2/service/glacier v1.26.14
-	github.com/aws/aws-sdk-go-v2/service/glue v1.105.6
-	github.com/aws/aws-sdk-go-v2/service/health v1.29.7
-	github.com/aws/aws-sdk-go-v2/service/iam v1.38.9
-	github.com/aws/aws-sdk-go-v2/service/inspector v1.25.13
-	github.com/aws/aws-sdk-go-v2/service/iot v1.62.6
-	github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.15
-	github.com/aws/aws-sdk-go-v2/service/kms v1.37.15
-	github.com/aws/aws-sdk-go-v2/service/lambda v1.69.9
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.13
-	github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics v1.24.13
-	github.com/aws/aws-sdk-go-v2/service/neptune v1.35.14
-	github.com/aws/aws-sdk-go-v2/service/pinpointemail v1.23.13
-	github.com/aws/aws-sdk-go-v2/service/polly v1.45.14
-	github.com/aws/aws-sdk-go-v2/service/rds v1.93.9
-	github.com/aws/aws-sdk-go-v2/service/redshift v1.53.9
-	github.com/aws/aws-sdk-go-v2/service/rekognition v1.45.15
-	github.com/aws/aws-sdk-go-v2/service/route53 v1.48.4
-	github.com/aws/aws-sdk-go-v2/service/route53domains v1.28.7
-	github.com/aws/aws-sdk-go-v2/service/route53resolver v1.34.10
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.1
-	github.com/aws/aws-sdk-go-v2/service/s3control v1.53.1
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.15
-	github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.32.13
-	github.com/aws/aws-sdk-go-v2/service/ses v1.29.8
-	github.com/aws/aws-sdk-go-v2/service/sfn v1.34.9
-	github.com/aws/aws-sdk-go-v2/service/shield v1.29.13
-	github.com/aws/aws-sdk-go-v2/service/snowball v1.30.15
-	github.com/aws/aws-sdk-go-v2/service/sns v1.33.16
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.37.11
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.56.9
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11
-	github.com/aws/aws-sdk-go-v2/service/support v1.26.13
-	github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.29.14
-	github.com/aws/aws-sdk-go-v2/service/transcribestreaming v1.23.1
-	github.com/aws/aws-sdk-go-v2/service/waf v1.25.13
-	github.com/aws/aws-sdk-go-v2/service/wafregional v1.25.13
-	github.com/aws/aws-sdk-go-v2/service/wafv2 v1.55.12
-	github.com/aws/aws-sdk-go-v2/service/workspaces v1.52.3
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.57
+	github.com/aws/aws-sdk-go-v2/service/acm v1.30.16
+	github.com/aws/aws-sdk-go-v2/service/apigateway v1.28.10
+	github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.34.11
+	github.com/aws/aws-sdk-go-v2/service/applicationdiscoveryservice v1.29.8
+	github.com/aws/aws-sdk-go-v2/service/appstream v1.43.1
+	github.com/aws/aws-sdk-go-v2/service/athena v1.49.8
+	github.com/aws/aws-sdk-go-v2/service/batch v1.49.10
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.10
+	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.8
+	github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.29.6
+	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.47.2
+	github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.12
+	github.com/aws/aws-sdk-go-v2/service/codebuild v1.51.0
+	github.com/aws/aws-sdk-go-v2/service/codecommit v1.27.14
+	github.com/aws/aws-sdk-go-v2/service/codedeploy v1.29.16
+	github.com/aws/aws-sdk-go-v2/service/codepipeline v1.38.7
+	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.49.3
+	github.com/aws/aws-sdk-go-v2/service/configservice v1.51.10
+	github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.28.14
+	github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.45.9
+	github.com/aws/aws-sdk-go-v2/service/devicefarm v1.28.14
+	github.com/aws/aws-sdk-go-v2/service/directconnect v1.30.10
+	github.com/aws/aws-sdk-go-v2/service/directoryservice v1.30.15
+	github.com/aws/aws-sdk-go-v2/service/docdb v1.40.8
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.8
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.202.2
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.40.1
+	github.com/aws/aws-sdk-go-v2/service/ecs v1.53.11
+	github.com/aws/aws-sdk-go-v2/service/efs v1.34.9
+	github.com/aws/aws-sdk-go-v2/service/elasticache v1.44.10
+	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.28.15
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.15
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.10
+	github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.32.16
+	github.com/aws/aws-sdk-go-v2/service/emr v1.47.10
+	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.9
+	github.com/aws/aws-sdk-go-v2/service/firehose v1.36.2
+	github.com/aws/aws-sdk-go-v2/service/gamelift v1.39.5
+	github.com/aws/aws-sdk-go-v2/service/glacier v1.26.15
+	github.com/aws/aws-sdk-go-v2/service/glue v1.105.7
+	github.com/aws/aws-sdk-go-v2/service/health v1.29.8
+	github.com/aws/aws-sdk-go-v2/service/iam v1.38.10
+	github.com/aws/aws-sdk-go-v2/service/inspector v1.25.14
+	github.com/aws/aws-sdk-go-v2/service/iot v1.62.7
+	github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.16
+	github.com/aws/aws-sdk-go-v2/service/kms v1.37.16
+	github.com/aws/aws-sdk-go-v2/service/lambda v1.69.10
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.14
+	github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics v1.24.14
+	github.com/aws/aws-sdk-go-v2/service/neptune v1.35.15
+	github.com/aws/aws-sdk-go-v2/service/pinpointemail v1.23.14
+	github.com/aws/aws-sdk-go-v2/service/polly v1.45.15
+	github.com/aws/aws-sdk-go-v2/service/rds v1.93.10
+	github.com/aws/aws-sdk-go-v2/service/redshift v1.53.10
+	github.com/aws/aws-sdk-go-v2/service/rekognition v1.45.16
+	github.com/aws/aws-sdk-go-v2/service/route53 v1.48.5
+	github.com/aws/aws-sdk-go-v2/service/route53domains v1.28.8
+	github.com/aws/aws-sdk-go-v2/service/route53resolver v1.34.11
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.2
+	github.com/aws/aws-sdk-go-v2/service/s3control v1.53.2
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.16
+	github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.32.14
+	github.com/aws/aws-sdk-go-v2/service/ses v1.29.9
+	github.com/aws/aws-sdk-go-v2/service/sfn v1.34.10
+	github.com/aws/aws-sdk-go-v2/service/shield v1.29.14
+	github.com/aws/aws-sdk-go-v2/service/snowball v1.30.16
+	github.com/aws/aws-sdk-go-v2/service/sns v1.33.17
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.37.12
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.56.10
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12
+	github.com/aws/aws-sdk-go-v2/service/support v1.26.14
+	github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.29.15
+	github.com/aws/aws-sdk-go-v2/service/transcribestreaming v1.23.2
+	github.com/aws/aws-sdk-go-v2/service/waf v1.25.14
+	github.com/aws/aws-sdk-go-v2/service/wafregional v1.25.14
+	github.com/aws/aws-sdk-go-v2/service/wafv2 v1.55.13
+	github.com/aws/aws-sdk-go-v2/service/workspaces v1.52.4
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
 )
 
 go 1.21
diff --git a/service/internal/integrationtest/go.sum b/service/internal/integrationtest/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/internal/integrationtest/go.sum
+++ b/service/internal/integrationtest/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/internal/integrationtest/s3/setup_test.go b/service/internal/integrationtest/s3/setup_test.go
index ea00037d6e3..e164336f6be 100644
--- a/service/internal/integrationtest/s3/setup_test.go
+++ b/service/internal/integrationtest/s3/setup_test.go
@@ -346,8 +346,8 @@ func testWriteToObject(t *testing.T, bucket string, testData writeToObjectTestDa
 		}
 
 	} else {
-		if len(testData.ExpectError) != 0 {
-			t.Fatalf("expected error: %v, got none", err)
+		if e := testData.ExpectError; len(e) != 0 {
+			t.Fatalf("expected error: %v, got none", e)
 		}
 	}
 
diff --git a/service/internal/presigned-url/CHANGELOG.md b/service/internal/presigned-url/CHANGELOG.md
index 6559dcaa6e1..04186fd27a9 100644
--- a/service/internal/presigned-url/CHANGELOG.md
+++ b/service/internal/presigned-url/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.12.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.12.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internal/presigned-url/go.mod b/service/internal/presigned-url/go.mod
index 43290c6889f..556b76d3749 100644
--- a/service/internal/presigned-url/go.mod
+++ b/service/internal/presigned-url/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/service/internal/presigned-url
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/internal/presigned-url/go_module_metadata.go b/service/internal/presigned-url/go_module_metadata.go
index 6da52d351c2..66771d9c975 100644
--- a/service/internal/presigned-url/go_module_metadata.go
+++ b/service/internal/presigned-url/go_module_metadata.go
@@ -3,4 +3,4 @@
 package presignedurl
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.12.11"
+const goModuleVersion = "1.12.12"
diff --git a/service/internal/s3shared/CHANGELOG.md b/service/internal/s3shared/CHANGELOG.md
index fc55de868f9..36736517be9 100644
--- a/service/internal/s3shared/CHANGELOG.md
+++ b/service/internal/s3shared/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.18.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.18.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internal/s3shared/go.mod b/service/internal/s3shared/go.mod
index 385ed57a14c..c45fb91856d 100644
--- a/service/internal/s3shared/go.mod
+++ b/service/internal/s3shared/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/service/internal/s3shared
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/internal/s3shared/go_module_metadata.go b/service/internal/s3shared/go_module_metadata.go
index b7c233be3c9..0898eac4481 100644
--- a/service/internal/s3shared/go_module_metadata.go
+++ b/service/internal/s3shared/go_module_metadata.go
@@ -3,4 +3,4 @@
 package s3shared
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.18.11"
+const goModuleVersion = "1.18.12"
diff --git a/service/internetmonitor/CHANGELOG.md b/service/internetmonitor/CHANGELOG.md
index 35c33142ecf..a9f5e68fcea 100644
--- a/service/internetmonitor/CHANGELOG.md
+++ b/service/internetmonitor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/internetmonitor/go.mod b/service/internetmonitor/go.mod
index 2e7304e1f13..5218376d974 100644
--- a/service/internetmonitor/go.mod
+++ b/service/internetmonitor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/internetmonitor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/internetmonitor/go_module_metadata.go b/service/internetmonitor/go_module_metadata.go
index e739d351b75..33648f0fba9 100644
--- a/service/internetmonitor/go_module_metadata.go
+++ b/service/internetmonitor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package internetmonitor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.11"
+const goModuleVersion = "1.20.12"
diff --git a/service/invoicing/CHANGELOG.md b/service/invoicing/CHANGELOG.md
index c253b4f3cc5..516f6d9a45d 100644
--- a/service/invoicing/CHANGELOG.md
+++ b/service/invoicing/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/invoicing/go.mod b/service/invoicing/go.mod
index 4c6d74e75cd..09564f2d874 100644
--- a/service/invoicing/go.mod
+++ b/service/invoicing/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/invoicing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/invoicing/go_module_metadata.go b/service/invoicing/go_module_metadata.go
index 29fe182c6dd..24414e31628 100644
--- a/service/invoicing/go_module_metadata.go
+++ b/service/invoicing/go_module_metadata.go
@@ -3,4 +3,4 @@
 package invoicing
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.6"
+const goModuleVersion = "1.0.7"
diff --git a/service/iot/CHANGELOG.md b/service/iot/CHANGELOG.md
index be3e51c0461..09f22ffc446 100644
--- a/service/iot/CHANGELOG.md
+++ b/service/iot/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.62.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.62.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iot/go.mod b/service/iot/go.mod
index 4173acb2339..8a053e19fee 100644
--- a/service/iot/go.mod
+++ b/service/iot/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iot
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iot/go_module_metadata.go b/service/iot/go_module_metadata.go
index ee37d2dfd48..afd9f132531 100644
--- a/service/iot/go_module_metadata.go
+++ b/service/iot/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iot
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.62.6"
+const goModuleVersion = "1.62.7"
diff --git a/service/iotanalytics/CHANGELOG.md b/service/iotanalytics/CHANGELOG.md
index 093719f6864..87a51e3286e 100644
--- a/service/iotanalytics/CHANGELOG.md
+++ b/service/iotanalytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotanalytics/go.mod b/service/iotanalytics/go.mod
index f65ab347695..fafc5c5531c 100644
--- a/service/iotanalytics/go.mod
+++ b/service/iotanalytics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotanalytics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotanalytics/go_module_metadata.go b/service/iotanalytics/go_module_metadata.go
index c9d269f677b..5c937c8b857 100644
--- a/service/iotanalytics/go_module_metadata.go
+++ b/service/iotanalytics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotanalytics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/iotdataplane/CHANGELOG.md b/service/iotdataplane/CHANGELOG.md
index c52e01832aa..07fcc807a19 100644
--- a/service/iotdataplane/CHANGELOG.md
+++ b/service/iotdataplane/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotdataplane/go.mod b/service/iotdataplane/go.mod
index fec6c776f4f..53c12ed0289 100644
--- a/service/iotdataplane/go.mod
+++ b/service/iotdataplane/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotdataplane
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotdataplane/go_module_metadata.go b/service/iotdataplane/go_module_metadata.go
index cf0b64ed40e..d0e70b23332 100644
--- a/service/iotdataplane/go_module_metadata.go
+++ b/service/iotdataplane/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotdataplane
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/iotdeviceadvisor/CHANGELOG.md b/service/iotdeviceadvisor/CHANGELOG.md
index 7297542a3b6..e8af843283e 100644
--- a/service/iotdeviceadvisor/CHANGELOG.md
+++ b/service/iotdeviceadvisor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotdeviceadvisor/go.mod b/service/iotdeviceadvisor/go.mod
index 0f7529176a1..e98255bd3ea 100644
--- a/service/iotdeviceadvisor/go.mod
+++ b/service/iotdeviceadvisor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotdeviceadvisor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotdeviceadvisor/go_module_metadata.go b/service/iotdeviceadvisor/go_module_metadata.go
index 2a8fc7a8343..a0fd08b00cd 100644
--- a/service/iotdeviceadvisor/go_module_metadata.go
+++ b/service/iotdeviceadvisor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotdeviceadvisor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.13"
+const goModuleVersion = "1.31.14"
diff --git a/service/iotevents/CHANGELOG.md b/service/iotevents/CHANGELOG.md
index 2dfc3f53c09..a1f5b8fd5bd 100644
--- a/service/iotevents/CHANGELOG.md
+++ b/service/iotevents/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotevents/go.mod b/service/iotevents/go.mod
index 9bb7baec363..885fdaa8bb4 100644
--- a/service/iotevents/go.mod
+++ b/service/iotevents/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotevents
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotevents/go_module_metadata.go b/service/iotevents/go_module_metadata.go
index d681f34374b..d843dd62778 100644
--- a/service/iotevents/go_module_metadata.go
+++ b/service/iotevents/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotevents
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/ioteventsdata/CHANGELOG.md b/service/ioteventsdata/CHANGELOG.md
index b406e5bf6d4..b36955d84c1 100644
--- a/service/ioteventsdata/CHANGELOG.md
+++ b/service/ioteventsdata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ioteventsdata/go.mod b/service/ioteventsdata/go.mod
index bf8511b6c25..564366137e8 100644
--- a/service/ioteventsdata/go.mod
+++ b/service/ioteventsdata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ioteventsdata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ioteventsdata/go_module_metadata.go b/service/ioteventsdata/go_module_metadata.go
index fe931d287ec..efec66058ff 100644
--- a/service/ioteventsdata/go_module_metadata.go
+++ b/service/ioteventsdata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ioteventsdata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/iotfleethub/CHANGELOG.md b/service/iotfleethub/CHANGELOG.md
index f9420cba029..6f81058a3b6 100644
--- a/service/iotfleethub/CHANGELOG.md
+++ b/service/iotfleethub/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotfleethub/go.mod b/service/iotfleethub/go.mod
index 928c270a927..c7d36b5232b 100644
--- a/service/iotfleethub/go.mod
+++ b/service/iotfleethub/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotfleethub
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotfleethub/go_module_metadata.go b/service/iotfleethub/go_module_metadata.go
index ba258c8163e..8ed973ef6ce 100644
--- a/service/iotfleethub/go_module_metadata.go
+++ b/service/iotfleethub/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotfleethub
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/iotfleetwise/CHANGELOG.md b/service/iotfleetwise/CHANGELOG.md
index 06b2f3ce9b6..82068a9edf5 100644
--- a/service/iotfleetwise/CHANGELOG.md
+++ b/service/iotfleetwise/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotfleetwise/go.mod b/service/iotfleetwise/go.mod
index 5ed5c57b671..d0664ce3d4e 100644
--- a/service/iotfleetwise/go.mod
+++ b/service/iotfleetwise/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotfleetwise
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotfleetwise/go_module_metadata.go b/service/iotfleetwise/go_module_metadata.go
index 101be56fcd8..6e6f853234d 100644
--- a/service/iotfleetwise/go_module_metadata.go
+++ b/service/iotfleetwise/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotfleetwise
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.8"
+const goModuleVersion = "1.22.9"
diff --git a/service/iotjobsdataplane/CHANGELOG.md b/service/iotjobsdataplane/CHANGELOG.md
index 74add2cbd33..236042d3f47 100644
--- a/service/iotjobsdataplane/CHANGELOG.md
+++ b/service/iotjobsdataplane/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotjobsdataplane/go.mod b/service/iotjobsdataplane/go.mod
index fb274dc2c6f..256b4f1a92e 100644
--- a/service/iotjobsdataplane/go.mod
+++ b/service/iotjobsdataplane/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotjobsdataplane
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotjobsdataplane/go_module_metadata.go b/service/iotjobsdataplane/go_module_metadata.go
index cefe1d45a78..c9e7abbf774 100644
--- a/service/iotjobsdataplane/go_module_metadata.go
+++ b/service/iotjobsdataplane/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotjobsdataplane
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.7"
+const goModuleVersion = "1.24.8"
diff --git a/service/iotsecuretunneling/CHANGELOG.md b/service/iotsecuretunneling/CHANGELOG.md
index 08060122d78..1e4f169785e 100644
--- a/service/iotsecuretunneling/CHANGELOG.md
+++ b/service/iotsecuretunneling/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotsecuretunneling/go.mod b/service/iotsecuretunneling/go.mod
index 7fe14e9b8f6..4491a561cd9 100644
--- a/service/iotsecuretunneling/go.mod
+++ b/service/iotsecuretunneling/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotsecuretunneling
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotsecuretunneling/go_module_metadata.go b/service/iotsecuretunneling/go_module_metadata.go
index ff9197028ee..7061a510c74 100644
--- a/service/iotsecuretunneling/go_module_metadata.go
+++ b/service/iotsecuretunneling/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotsecuretunneling
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.5"
+const goModuleVersion = "1.28.6"
diff --git a/service/iotsitewise/CHANGELOG.md b/service/iotsitewise/CHANGELOG.md
index 0ca30f8afc5..a1dc9d1f6af 100644
--- a/service/iotsitewise/CHANGELOG.md
+++ b/service/iotsitewise/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.45.3 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotsitewise/api_op_DescribeAsset.go b/service/iotsitewise/api_op_DescribeAsset.go
index bcd95178279..a14ff02d9fe 100644
--- a/service/iotsitewise/api_op_DescribeAsset.go
+++ b/service/iotsitewise/api_op_DescribeAsset.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -384,35 +383,31 @@ func (w *AssetActiveWaiter) WaitForOutput(ctx context.Context, params *DescribeA
 func assetActiveStateRetryable(ctx context.Context, input *DescribeAssetInput, output *DescribeAssetOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("assetStatus.state", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.AssetStatus
+		var v2 types.AssetState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.AssetState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AssetState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("assetStatus.state", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.AssetStatus
+		var v2 types.AssetState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.AssetState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AssetState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/iotsitewise/api_op_DescribeAssetModel.go b/service/iotsitewise/api_op_DescribeAssetModel.go
index acb8148e17d..6d2cc6545cc 100644
--- a/service/iotsitewise/api_op_DescribeAssetModel.go
+++ b/service/iotsitewise/api_op_DescribeAssetModel.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -417,35 +416,31 @@ func (w *AssetModelActiveWaiter) WaitForOutput(ctx context.Context, params *Desc
 func assetModelActiveStateRetryable(ctx context.Context, input *DescribeAssetModelInput, output *DescribeAssetModelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("assetModelStatus.state", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.AssetModelStatus
+		var v2 types.AssetModelState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.AssetModelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AssetModelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("assetModelStatus.state", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.AssetModelStatus
+		var v2 types.AssetModelState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.AssetModelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.AssetModelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/iotsitewise/api_op_DescribePortal.go b/service/iotsitewise/api_op_DescribePortal.go
index 7a73a670dcb..ececb7b9e68 100644
--- a/service/iotsitewise/api_op_DescribePortal.go
+++ b/service/iotsitewise/api_op_DescribePortal.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -400,18 +399,16 @@ func (w *PortalActiveWaiter) WaitForOutput(ctx context.Context, params *Describe
 func portalActiveStateRetryable(ctx context.Context, input *DescribePortalInput, output *DescribePortalOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("portalStatus.state", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.PortalStatus
+		var v2 types.PortalState
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.PortalState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.PortalState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/iotsitewise/generated.json b/service/iotsitewise/generated.json
index b0f676a8370..088e74a10ef 100644
--- a/service/iotsitewise/generated.json
+++ b/service/iotsitewise/generated.json
@@ -4,8 +4,7 @@
         "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/iotsitewise/go.mod b/service/iotsitewise/go.mod
index 90607dc9a0a..74ae4648f2b 100644
--- a/service/iotsitewise/go.mod
+++ b/service/iotsitewise/go.mod
@@ -3,12 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/iotsitewise
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/iotsitewise/go.sum b/service/iotsitewise/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/iotsitewise/go.sum
+++ b/service/iotsitewise/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/iotsitewise/go_module_metadata.go b/service/iotsitewise/go_module_metadata.go
index 52db3e71aef..f3f6589b2aa 100644
--- a/service/iotsitewise/go_module_metadata.go
+++ b/service/iotsitewise/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotsitewise
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.2"
+const goModuleVersion = "1.45.3"
diff --git a/service/iotthingsgraph/CHANGELOG.md b/service/iotthingsgraph/CHANGELOG.md
index 8acdf77f882..ab80203c601 100644
--- a/service/iotthingsgraph/CHANGELOG.md
+++ b/service/iotthingsgraph/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotthingsgraph/go.mod b/service/iotthingsgraph/go.mod
index 6f29f323f04..01b03bca383 100644
--- a/service/iotthingsgraph/go.mod
+++ b/service/iotthingsgraph/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotthingsgraph
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotthingsgraph/go_module_metadata.go b/service/iotthingsgraph/go_module_metadata.go
index 837d4bf506e..d1f1281e30f 100644
--- a/service/iotthingsgraph/go_module_metadata.go
+++ b/service/iotthingsgraph/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotthingsgraph
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/iottwinmaker/CHANGELOG.md b/service/iottwinmaker/CHANGELOG.md
index bc7a49ece75..e8f53b89d17 100644
--- a/service/iottwinmaker/CHANGELOG.md
+++ b/service/iottwinmaker/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iottwinmaker/go.mod b/service/iottwinmaker/go.mod
index 05e37605734..d169ba9637d 100644
--- a/service/iottwinmaker/go.mod
+++ b/service/iottwinmaker/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iottwinmaker
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iottwinmaker/go_module_metadata.go b/service/iottwinmaker/go_module_metadata.go
index de4c07e9374..c346ea921b6 100644
--- a/service/iottwinmaker/go_module_metadata.go
+++ b/service/iottwinmaker/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iottwinmaker
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/iotwireless/CHANGELOG.md b/service/iotwireless/CHANGELOG.md
index 273457210d3..03e22ccbee9 100644
--- a/service/iotwireless/CHANGELOG.md
+++ b/service/iotwireless/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/iotwireless/go.mod b/service/iotwireless/go.mod
index 5a51e18270e..944442fc63a 100644
--- a/service/iotwireless/go.mod
+++ b/service/iotwireless/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/iotwireless
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/iotwireless/go_module_metadata.go b/service/iotwireless/go_module_metadata.go
index ab7aafa83cd..dbfdf2b4000 100644
--- a/service/iotwireless/go_module_metadata.go
+++ b/service/iotwireless/go_module_metadata.go
@@ -3,4 +3,4 @@
 package iotwireless
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.8"
+const goModuleVersion = "1.45.9"
diff --git a/service/ivs/CHANGELOG.md b/service/ivs/CHANGELOG.md
index 42bf24e074a..1ea43d40035 100644
--- a/service/ivs/CHANGELOG.md
+++ b/service/ivs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.42.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.42.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ivs/go.mod b/service/ivs/go.mod
index 1f8171ad889..dadc11d529c 100644
--- a/service/ivs/go.mod
+++ b/service/ivs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ivs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ivs/go_module_metadata.go b/service/ivs/go_module_metadata.go
index 1de99cbb788..004218dc8ad 100644
--- a/service/ivs/go_module_metadata.go
+++ b/service/ivs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ivs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.42.8"
+const goModuleVersion = "1.42.9"
diff --git a/service/ivschat/CHANGELOG.md b/service/ivschat/CHANGELOG.md
index e9aa05e3409..b6236c3c6df 100644
--- a/service/ivschat/CHANGELOG.md
+++ b/service/ivschat/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ivschat/go.mod b/service/ivschat/go.mod
index aaa49217646..3a515b0a919 100644
--- a/service/ivschat/go.mod
+++ b/service/ivschat/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ivschat
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ivschat/go_module_metadata.go b/service/ivschat/go_module_metadata.go
index d1b192278ee..94865fcfca1 100644
--- a/service/ivschat/go_module_metadata.go
+++ b/service/ivschat/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ivschat
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.13"
+const goModuleVersion = "1.16.14"
diff --git a/service/ivsrealtime/CHANGELOG.md b/service/ivsrealtime/CHANGELOG.md
index bfe2592e7c6..028d4bb542e 100644
--- a/service/ivsrealtime/CHANGELOG.md
+++ b/service/ivsrealtime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ivsrealtime/go.mod b/service/ivsrealtime/go.mod
index 1d36cd42e55..0519da20077 100644
--- a/service/ivsrealtime/go.mod
+++ b/service/ivsrealtime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ivsrealtime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ivsrealtime/go_module_metadata.go b/service/ivsrealtime/go_module_metadata.go
index 9cb47e09c41..2953adb2ed1 100644
--- a/service/ivsrealtime/go_module_metadata.go
+++ b/service/ivsrealtime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ivsrealtime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.6"
+const goModuleVersion = "1.21.7"
diff --git a/service/kafka/CHANGELOG.md b/service/kafka/CHANGELOG.md
index 194c36dfce7..8076d974fdc 100644
--- a/service/kafka/CHANGELOG.md
+++ b/service/kafka/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.38.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.38.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kafka/go.mod b/service/kafka/go.mod
index b8079862c65..e9d15eaa5d8 100644
--- a/service/kafka/go.mod
+++ b/service/kafka/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kafka
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kafka/go_module_metadata.go b/service/kafka/go_module_metadata.go
index 07915f9cc35..dc4852cf163 100644
--- a/service/kafka/go_module_metadata.go
+++ b/service/kafka/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kafka
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.38.14"
+const goModuleVersion = "1.38.15"
diff --git a/service/kafkaconnect/CHANGELOG.md b/service/kafkaconnect/CHANGELOG.md
index f1e9a54a08e..0d34b872866 100644
--- a/service/kafkaconnect/CHANGELOG.md
+++ b/service/kafkaconnect/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kafkaconnect/go.mod b/service/kafkaconnect/go.mod
index 44c5e853603..fda77665160 100644
--- a/service/kafkaconnect/go.mod
+++ b/service/kafkaconnect/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kafkaconnect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kafkaconnect/go_module_metadata.go b/service/kafkaconnect/go_module_metadata.go
index e15a5f9c209..06398414caf 100644
--- a/service/kafkaconnect/go_module_metadata.go
+++ b/service/kafkaconnect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kafkaconnect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.4"
+const goModuleVersion = "1.22.5"
diff --git a/service/kendra/CHANGELOG.md b/service/kendra/CHANGELOG.md
index c4ae356a8c5..de7352a4fc0 100644
--- a/service/kendra/CHANGELOG.md
+++ b/service/kendra/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.55.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.55.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kendra/go.mod b/service/kendra/go.mod
index 1d56f90e136..5e936ec277c 100644
--- a/service/kendra/go.mod
+++ b/service/kendra/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kendra
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kendra/go_module_metadata.go b/service/kendra/go_module_metadata.go
index f4f834fd10f..4bea937e3ce 100644
--- a/service/kendra/go_module_metadata.go
+++ b/service/kendra/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kendra
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.55.6"
+const goModuleVersion = "1.55.7"
diff --git a/service/kendraranking/CHANGELOG.md b/service/kendraranking/CHANGELOG.md
index 5dc6ced80f9..0d679a5230f 100644
--- a/service/kendraranking/CHANGELOG.md
+++ b/service/kendraranking/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kendraranking/go.mod b/service/kendraranking/go.mod
index 221c40db86d..c85b81edc53 100644
--- a/service/kendraranking/go.mod
+++ b/service/kendraranking/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kendraranking
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kendraranking/go_module_metadata.go b/service/kendraranking/go_module_metadata.go
index 45f02042d7a..fe0a7e9a6d7 100644
--- a/service/kendraranking/go_module_metadata.go
+++ b/service/kendraranking/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kendraranking
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.15"
+const goModuleVersion = "1.11.16"
diff --git a/service/keyspaces/CHANGELOG.md b/service/keyspaces/CHANGELOG.md
index a7776d0f134..f192ed3e33a 100644
--- a/service/keyspaces/CHANGELOG.md
+++ b/service/keyspaces/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/keyspaces/go.mod b/service/keyspaces/go.mod
index 664a6cea862..3b8acccd289 100644
--- a/service/keyspaces/go.mod
+++ b/service/keyspaces/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/keyspaces
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/keyspaces/go_module_metadata.go b/service/keyspaces/go_module_metadata.go
index 0920fece319..382b7e382f2 100644
--- a/service/keyspaces/go_module_metadata.go
+++ b/service/keyspaces/go_module_metadata.go
@@ -3,4 +3,4 @@
 package keyspaces
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.8"
+const goModuleVersion = "1.16.9"
diff --git a/service/kinesis/CHANGELOG.md b/service/kinesis/CHANGELOG.md
index 1d14bff5432..953cf73edc7 100644
--- a/service/kinesis/CHANGELOG.md
+++ b/service/kinesis/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.32.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesis/api_op_DescribeStream.go b/service/kinesis/api_op_DescribeStream.go
index 8081462b8d0..ccfa5055fcb 100644
--- a/service/kinesis/api_op_DescribeStream.go
+++ b/service/kinesis/api_op_DescribeStream.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -364,18 +363,16 @@ func (w *StreamExistsWaiter) WaitForOutput(ctx context.Context, params *Describe
 func streamExistsStateRetryable(ctx context.Context, input *DescribeStreamInput, output *DescribeStreamOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("StreamDescription.StreamStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.StreamDescription
+		var v2 types.StreamStatus
+		if v1 != nil {
+			v3 := v1.StreamStatus
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.StreamStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StreamStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/kinesis/generated.json b/service/kinesis/generated.json
index 927a1c29d16..27fd1bd50f2 100644
--- a/service/kinesis/generated.json
+++ b/service/kinesis/generated.json
@@ -4,8 +4,7 @@
         "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/kinesis/go.mod b/service/kinesis/go.mod
index f0f1196aac8..6723eb6adf1 100644
--- a/service/kinesis/go.mod
+++ b/service/kinesis/go.mod
@@ -3,12 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/kinesis
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/kinesis/go.sum b/service/kinesis/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/kinesis/go.sum
+++ b/service/kinesis/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/kinesis/go_module_metadata.go b/service/kinesis/go_module_metadata.go
index 1b326f80177..1a35bfe3ce3 100644
--- a/service/kinesis/go_module_metadata.go
+++ b/service/kinesis/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesis
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.15"
+const goModuleVersion = "1.32.16"
diff --git a/service/kinesis/internal/testing/go.mod b/service/kinesis/internal/testing/go.mod
index 944a664eb5c..1e9658e1ae0 100644
--- a/service/kinesis/internal/testing/go.mod
+++ b/service/kinesis/internal/testing/go.mod
@@ -3,18 +3,17 @@ module github.com/aws/aws-sdk-go-v2/service/kinesis/internal/testing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/service/internal/eventstreamtesting v1.5.17
-	github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.15
+	github.com/aws/aws-sdk-go-v2/service/internal/eventstreamtesting v1.5.18
+	github.com/aws/aws-sdk-go-v2/service/kinesis v1.32.16
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../
diff --git a/service/kinesis/internal/testing/go.sum b/service/kinesis/internal/testing/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/kinesis/internal/testing/go.sum
+++ b/service/kinesis/internal/testing/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/kinesisanalytics/CHANGELOG.md b/service/kinesisanalytics/CHANGELOG.md
index 2bf4cb194e6..6f67b4cc963 100644
--- a/service/kinesisanalytics/CHANGELOG.md
+++ b/service/kinesisanalytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisanalytics/go.mod b/service/kinesisanalytics/go.mod
index e322ab7463b..e5556ba7cc4 100644
--- a/service/kinesisanalytics/go.mod
+++ b/service/kinesisanalytics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisanalytics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisanalytics/go_module_metadata.go b/service/kinesisanalytics/go_module_metadata.go
index d77f9c4f0c6..8717f060803 100644
--- a/service/kinesisanalytics/go_module_metadata.go
+++ b/service/kinesisanalytics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisanalytics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.14"
+const goModuleVersion = "1.25.15"
diff --git a/service/kinesisanalyticsv2/CHANGELOG.md b/service/kinesisanalyticsv2/CHANGELOG.md
index 409f8d99b92..a4e4376a57c 100644
--- a/service/kinesisanalyticsv2/CHANGELOG.md
+++ b/service/kinesisanalyticsv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisanalyticsv2/go.mod b/service/kinesisanalyticsv2/go.mod
index e75e691850d..3c9be057979 100644
--- a/service/kinesisanalyticsv2/go.mod
+++ b/service/kinesisanalyticsv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisanalyticsv2/go_module_metadata.go b/service/kinesisanalyticsv2/go_module_metadata.go
index 4cf198abebc..4d97df87dc2 100644
--- a/service/kinesisanalyticsv2/go_module_metadata.go
+++ b/service/kinesisanalyticsv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisanalyticsv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.14"
+const goModuleVersion = "1.31.15"
diff --git a/service/kinesisvideo/CHANGELOG.md b/service/kinesisvideo/CHANGELOG.md
index 7d6a4db46b6..4c727708408 100644
--- a/service/kinesisvideo/CHANGELOG.md
+++ b/service/kinesisvideo/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisvideo/go.mod b/service/kinesisvideo/go.mod
index 67b53852785..fa366f4db03 100644
--- a/service/kinesisvideo/go.mod
+++ b/service/kinesisvideo/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideo
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisvideo/go_module_metadata.go b/service/kinesisvideo/go_module_metadata.go
index 1266b26c0cf..89f63fefa63 100644
--- a/service/kinesisvideo/go_module_metadata.go
+++ b/service/kinesisvideo/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisvideo
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/kinesisvideoarchivedmedia/CHANGELOG.md b/service/kinesisvideoarchivedmedia/CHANGELOG.md
index dc0a5957ec3..e05ad4f40f1 100644
--- a/service/kinesisvideoarchivedmedia/CHANGELOG.md
+++ b/service/kinesisvideoarchivedmedia/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisvideoarchivedmedia/go.mod b/service/kinesisvideoarchivedmedia/go.mod
index aa2632fe5b3..5f3db47bceb 100644
--- a/service/kinesisvideoarchivedmedia/go.mod
+++ b/service/kinesisvideoarchivedmedia/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideoarchivedmedia
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisvideoarchivedmedia/go_module_metadata.go b/service/kinesisvideoarchivedmedia/go_module_metadata.go
index b34e34935a8..3cc7dfe9fbd 100644
--- a/service/kinesisvideoarchivedmedia/go_module_metadata.go
+++ b/service/kinesisvideoarchivedmedia/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisvideoarchivedmedia
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/kinesisvideomedia/CHANGELOG.md b/service/kinesisvideomedia/CHANGELOG.md
index 3e7bc38d129..5bb24d2c4a2 100644
--- a/service/kinesisvideomedia/CHANGELOG.md
+++ b/service/kinesisvideomedia/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisvideomedia/go.mod b/service/kinesisvideomedia/go.mod
index ebf37fac500..c3ecdfa8ffb 100644
--- a/service/kinesisvideomedia/go.mod
+++ b/service/kinesisvideomedia/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideomedia
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisvideomedia/go_module_metadata.go b/service/kinesisvideomedia/go_module_metadata.go
index 464ee8d5bf5..98161f052f8 100644
--- a/service/kinesisvideomedia/go_module_metadata.go
+++ b/service/kinesisvideomedia/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisvideomedia
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.13"
+const goModuleVersion = "1.22.14"
diff --git a/service/kinesisvideosignaling/CHANGELOG.md b/service/kinesisvideosignaling/CHANGELOG.md
index 9c6733d0880..c6b4f59a0c6 100644
--- a/service/kinesisvideosignaling/CHANGELOG.md
+++ b/service/kinesisvideosignaling/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisvideosignaling/go.mod b/service/kinesisvideosignaling/go.mod
index 39106a984ed..2fee099a128 100644
--- a/service/kinesisvideosignaling/go.mod
+++ b/service/kinesisvideosignaling/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideosignaling
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisvideosignaling/go_module_metadata.go b/service/kinesisvideosignaling/go_module_metadata.go
index ace7b3e9bc0..0adfae160e2 100644
--- a/service/kinesisvideosignaling/go_module_metadata.go
+++ b/service/kinesisvideosignaling/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisvideosignaling
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/kinesisvideowebrtcstorage/CHANGELOG.md b/service/kinesisvideowebrtcstorage/CHANGELOG.md
index a625598e15b..432d9c0dc35 100644
--- a/service/kinesisvideowebrtcstorage/CHANGELOG.md
+++ b/service/kinesisvideowebrtcstorage/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kinesisvideowebrtcstorage/go.mod b/service/kinesisvideowebrtcstorage/go.mod
index ce2b16dda3e..28f958ef56c 100644
--- a/service/kinesisvideowebrtcstorage/go.mod
+++ b/service/kinesisvideowebrtcstorage/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kinesisvideowebrtcstorage
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kinesisvideowebrtcstorage/go_module_metadata.go b/service/kinesisvideowebrtcstorage/go_module_metadata.go
index 6668ec9e8ef..a62f7470f13 100644
--- a/service/kinesisvideowebrtcstorage/go_module_metadata.go
+++ b/service/kinesisvideowebrtcstorage/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kinesisvideowebrtcstorage
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.13"
+const goModuleVersion = "1.14.14"
diff --git a/service/kms/CHANGELOG.md b/service/kms/CHANGELOG.md
index ea8356ebef4..e87a329d083 100644
--- a/service/kms/CHANGELOG.md
+++ b/service/kms/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.37.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/kms/go.mod b/service/kms/go.mod
index 7b5fa6a1e28..e8cc51ae6e7 100644
--- a/service/kms/go.mod
+++ b/service/kms/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/kms
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/kms/go_module_metadata.go b/service/kms/go_module_metadata.go
index 047f05360a0..2d2352f1464 100644
--- a/service/kms/go_module_metadata.go
+++ b/service/kms/go_module_metadata.go
@@ -3,4 +3,4 @@
 package kms
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.15"
+const goModuleVersion = "1.37.16"
diff --git a/service/lakeformation/CHANGELOG.md b/service/lakeformation/CHANGELOG.md
index f2eeef83ebf..a8f942d3403 100644
--- a/service/lakeformation/CHANGELOG.md
+++ b/service/lakeformation/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.39.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.39.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lakeformation/go.mod b/service/lakeformation/go.mod
index ff0cf95df59..5aa2f699945 100644
--- a/service/lakeformation/go.mod
+++ b/service/lakeformation/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lakeformation
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lakeformation/go_module_metadata.go b/service/lakeformation/go_module_metadata.go
index f62fc2caac9..20bd041b35f 100644
--- a/service/lakeformation/go_module_metadata.go
+++ b/service/lakeformation/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lakeformation
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.39.7"
+const goModuleVersion = "1.39.8"
diff --git a/service/lambda/CHANGELOG.md b/service/lambda/CHANGELOG.md
index 46027d0fe57..eb7cbf96456 100644
--- a/service/lambda/CHANGELOG.md
+++ b/service/lambda/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.69.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.69.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lambda/api_op_GetFunction.go b/service/lambda/api_op_GetFunction.go
index 3f93d1beb45..3e6e65de7ec 100644
--- a/service/lambda/api_op_GetFunction.go
+++ b/service/lambda/api_op_GetFunction.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -349,52 +348,46 @@ func (w *FunctionActiveV2Waiter) WaitForOutput(ctx context.Context, params *GetF
 func functionActiveV2StateRetryable(ctx context.Context, input *GetFunctionInput, output *GetFunctionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Active"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "Pending"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -741,52 +734,46 @@ func (w *FunctionUpdatedV2Waiter) WaitForOutput(ctx context.Context, params *Get
 func functionUpdatedV2StateRetryable(ctx context.Context, input *GetFunctionInput, output *GetFunctionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.LastUpdateStatus
+		if v1 != nil {
+			v3 := v1.LastUpdateStatus
+			v2 = v3
 		}
-
 		expectedValue := "Successful"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.LastUpdateStatus
+		if v1 != nil {
+			v3 := v1.LastUpdateStatus
+			v2 = v3
 		}
-
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Configuration.LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Configuration
+		var v2 types.LastUpdateStatus
+		if v1 != nil {
+			v3 := v1.LastUpdateStatus
+			v2 = v3
 		}
-
 		expectedValue := "InProgress"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/lambda/api_op_GetFunctionConfiguration.go b/service/lambda/api_op_GetFunctionConfiguration.go
index d1690504d2a..615782f5bad 100644
--- a/service/lambda/api_op_GetFunctionConfiguration.go
+++ b/service/lambda/api_op_GetFunctionConfiguration.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -495,52 +494,31 @@ func (w *FunctionActiveWaiter) WaitForOutput(ctx context.Context, params *GetFun
 func functionActiveStateRetryable(ctx context.Context, input *GetFunctionConfigurationInput, output *GetFunctionConfigurationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Active"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Pending"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -711,52 +689,31 @@ func (w *FunctionUpdatedWaiter) WaitForOutput(ctx context.Context, params *GetFu
 func functionUpdatedStateRetryable(ctx context.Context, input *GetFunctionConfigurationInput, output *GetFunctionConfigurationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LastUpdateStatus
 		expectedValue := "Successful"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LastUpdateStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("LastUpdateStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.LastUpdateStatus
 		expectedValue := "InProgress"
-		value, ok := pathValue.(types.LastUpdateStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.LastUpdateStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -929,52 +886,31 @@ func (w *PublishedVersionActiveWaiter) WaitForOutput(ctx context.Context, params
 func publishedVersionActiveStateRetryable(ctx context.Context, input *GetFunctionConfigurationInput, output *GetFunctionConfigurationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Active"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "Pending"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/lambda/generated.json b/service/lambda/generated.json
index 42f7f193c80..260f6907948 100644
--- a/service/lambda/generated.json
+++ b/service/lambda/generated.json
@@ -4,8 +4,7 @@
         "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/lambda/go.mod b/service/lambda/go.mod
index aea2a0f195e..af50963727b 100644
--- a/service/lambda/go.mod
+++ b/service/lambda/go.mod
@@ -3,12 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/lambda
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/lambda/go.sum b/service/lambda/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/lambda/go.sum
+++ b/service/lambda/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/lambda/go_module_metadata.go b/service/lambda/go_module_metadata.go
index 8b4bf06d133..6e4f582c60c 100644
--- a/service/lambda/go_module_metadata.go
+++ b/service/lambda/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lambda
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.69.9"
+const goModuleVersion = "1.69.10"
diff --git a/service/launchwizard/CHANGELOG.md b/service/launchwizard/CHANGELOG.md
index a00c5ad7875..a390135f092 100644
--- a/service/launchwizard/CHANGELOG.md
+++ b/service/launchwizard/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/launchwizard/go.mod b/service/launchwizard/go.mod
index 0fdfc2ce887..7278fa7a0df 100644
--- a/service/launchwizard/go.mod
+++ b/service/launchwizard/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/launchwizard
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/launchwizard/go_module_metadata.go b/service/launchwizard/go_module_metadata.go
index 89c7ef3485d..e9b0e39f24f 100644
--- a/service/launchwizard/go_module_metadata.go
+++ b/service/launchwizard/go_module_metadata.go
@@ -3,4 +3,4 @@
 package launchwizard
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.13"
+const goModuleVersion = "1.8.14"
diff --git a/service/lexmodelbuildingservice/CHANGELOG.md b/service/lexmodelbuildingservice/CHANGELOG.md
index 20295d68bac..c16118637b0 100644
--- a/service/lexmodelbuildingservice/CHANGELOG.md
+++ b/service/lexmodelbuildingservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lexmodelbuildingservice/go.mod b/service/lexmodelbuildingservice/go.mod
index 015a983296d..a0aab882d73 100644
--- a/service/lexmodelbuildingservice/go.mod
+++ b/service/lexmodelbuildingservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lexmodelbuildingservice/go_module_metadata.go b/service/lexmodelbuildingservice/go_module_metadata.go
index 41117602b15..d0914532feb 100644
--- a/service/lexmodelbuildingservice/go_module_metadata.go
+++ b/service/lexmodelbuildingservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lexmodelbuildingservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/lexmodelsv2/CHANGELOG.md b/service/lexmodelsv2/CHANGELOG.md
index 95092a54b2b..fc84c3a6890 100644
--- a/service/lexmodelsv2/CHANGELOG.md
+++ b/service/lexmodelsv2/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.49.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.49.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lexmodelsv2/api_op_DescribeBot.go b/service/lexmodelsv2/api_op_DescribeBot.go
index a98b0657556..d1ccf4862e6 100644
--- a/service/lexmodelsv2/api_op_DescribeBot.go
+++ b/service/lexmodelsv2/api_op_DescribeBot.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -348,69 +347,41 @@ func (w *BotAvailableWaiter) WaitForOutput(ctx context.Context, params *Describe
 func botAvailableStateRetryable(ctx context.Context, input *DescribeBotInput, output *DescribeBotOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Available"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Inactive"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/api_op_DescribeBotAlias.go b/service/lexmodelsv2/api_op_DescribeBotAlias.go
index a5167ffae1a..3d953215098 100644
--- a/service/lexmodelsv2/api_op_DescribeBotAlias.go
+++ b/service/lexmodelsv2/api_op_DescribeBotAlias.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,52 +356,31 @@ func (w *BotAliasAvailableWaiter) WaitForOutput(ctx context.Context, params *Des
 func botAliasAvailableStateRetryable(ctx context.Context, input *DescribeBotAliasInput, output *DescribeBotAliasOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botAliasStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotAliasStatus
 		expectedValue := "Available"
-		value, ok := pathValue.(types.BotAliasStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotAliasStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botAliasStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotAliasStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotAliasStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotAliasStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botAliasStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotAliasStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotAliasStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotAliasStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/api_op_DescribeBotLocale.go b/service/lexmodelsv2/api_op_DescribeBotLocale.go
index 4b8f46f9092..3754c141139 100644
--- a/service/lexmodelsv2/api_op_DescribeBotLocale.go
+++ b/service/lexmodelsv2/api_op_DescribeBotLocale.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -379,69 +378,41 @@ func (w *BotLocaleBuiltWaiter) WaitForOutput(ctx context.Context, params *Descri
 func botLocaleBuiltStateRetryable(ctx context.Context, input *DescribeBotLocaleInput, output *DescribeBotLocaleOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Built"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "NotBuilt"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -612,86 +583,51 @@ func (w *BotLocaleCreatedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func botLocaleCreatedStateRetryable(ctx context.Context, input *DescribeBotLocaleInput, output *DescribeBotLocaleOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Built"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "ReadyExpressTesting"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "NotBuilt"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -867,86 +803,51 @@ func (w *BotLocaleExpressTestingAvailableWaiter) WaitForOutput(ctx context.Conte
 func botLocaleExpressTestingAvailableStateRetryable(ctx context.Context, input *DescribeBotLocaleInput, output *DescribeBotLocaleOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Built"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "ReadyExpressTesting"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botLocaleStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotLocaleStatus
 		expectedValue := "NotBuilt"
-		value, ok := pathValue.(types.BotLocaleStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotLocaleStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/api_op_DescribeBotVersion.go b/service/lexmodelsv2/api_op_DescribeBotVersion.go
index 5067afcc947..63b15177ef5 100644
--- a/service/lexmodelsv2/api_op_DescribeBotVersion.go
+++ b/service/lexmodelsv2/api_op_DescribeBotVersion.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -360,52 +359,31 @@ func (w *BotVersionAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func botVersionAvailableStateRetryable(ctx context.Context, input *DescribeBotVersionInput, output *DescribeBotVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Available"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("botStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.BotStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.BotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.BotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/api_op_DescribeExport.go b/service/lexmodelsv2/api_op_DescribeExport.go
index d2881cbf2dd..c120516b636 100644
--- a/service/lexmodelsv2/api_op_DescribeExport.go
+++ b/service/lexmodelsv2/api_op_DescribeExport.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -336,52 +335,31 @@ func (w *BotExportCompletedWaiter) WaitForOutput(ctx context.Context, params *De
 func botExportCompletedStateRetryable(ctx context.Context, input *DescribeExportInput, output *DescribeExportOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("exportStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ExportStatus
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.ExportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("exportStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ExportStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.ExportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("exportStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ExportStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.ExportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/api_op_DescribeImport.go b/service/lexmodelsv2/api_op_DescribeImport.go
index 4d79e95ae02..2637af7119c 100644
--- a/service/lexmodelsv2/api_op_DescribeImport.go
+++ b/service/lexmodelsv2/api_op_DescribeImport.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -341,52 +340,31 @@ func (w *BotImportCompletedWaiter) WaitForOutput(ctx context.Context, params *De
 func botImportCompletedStateRetryable(ctx context.Context, input *DescribeImportInput, output *DescribeImportOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("importStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImportStatus
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.ImportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("importStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImportStatus
 		expectedValue := "Deleting"
-		value, ok := pathValue.(types.ImportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("importStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImportStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.ImportStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/lexmodelsv2/generated.json b/service/lexmodelsv2/generated.json
index 6f084d33c11..e48d5a7bcc4 100644
--- a/service/lexmodelsv2/generated.json
+++ b/service/lexmodelsv2/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/lexmodelsv2/go.mod b/service/lexmodelsv2/go.mod
index 64e11c5e053..3a4ff70512a 100644
--- a/service/lexmodelsv2/go.mod
+++ b/service/lexmodelsv2/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/lexmodelsv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/lexmodelsv2/go.sum b/service/lexmodelsv2/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/lexmodelsv2/go.sum
+++ b/service/lexmodelsv2/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/lexmodelsv2/go_module_metadata.go b/service/lexmodelsv2/go_module_metadata.go
index 9f51cd04cbd..527169659ea 100644
--- a/service/lexmodelsv2/go_module_metadata.go
+++ b/service/lexmodelsv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lexmodelsv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.49.14"
+const goModuleVersion = "1.49.15"
diff --git a/service/lexruntimeservice/CHANGELOG.md b/service/lexruntimeservice/CHANGELOG.md
index 7f5880108bc..2173ef62da7 100644
--- a/service/lexruntimeservice/CHANGELOG.md
+++ b/service/lexruntimeservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lexruntimeservice/go.mod b/service/lexruntimeservice/go.mod
index c608bd80d9b..b86fecbb5a2 100644
--- a/service/lexruntimeservice/go.mod
+++ b/service/lexruntimeservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lexruntimeservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lexruntimeservice/go_module_metadata.go b/service/lexruntimeservice/go_module_metadata.go
index 351806aa476..4b7c5489e7e 100644
--- a/service/lexruntimeservice/go_module_metadata.go
+++ b/service/lexruntimeservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lexruntimeservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/lexruntimev2/CHANGELOG.md b/service/lexruntimev2/CHANGELOG.md
index dca367ccfc9..6f731bae939 100644
--- a/service/lexruntimev2/CHANGELOG.md
+++ b/service/lexruntimev2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lexruntimev2/go.mod b/service/lexruntimev2/go.mod
index 942456d000a..6442a0ae27a 100644
--- a/service/lexruntimev2/go.mod
+++ b/service/lexruntimev2/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/lexruntimev2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lexruntimev2/go_module_metadata.go b/service/lexruntimev2/go_module_metadata.go
index ddc18adcae0..173e9242324 100644
--- a/service/lexruntimev2/go_module_metadata.go
+++ b/service/lexruntimev2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lexruntimev2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/licensemanager/CHANGELOG.md b/service/licensemanager/CHANGELOG.md
index d2a0683305f..d1a47dda794 100644
--- a/service/licensemanager/CHANGELOG.md
+++ b/service/licensemanager/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/licensemanager/go.mod b/service/licensemanager/go.mod
index 7469f3380bc..e7f73b5dc89 100644
--- a/service/licensemanager/go.mod
+++ b/service/licensemanager/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/licensemanager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/licensemanager/go_module_metadata.go b/service/licensemanager/go_module_metadata.go
index c3123e07031..a2c86e3c8a0 100644
--- a/service/licensemanager/go_module_metadata.go
+++ b/service/licensemanager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package licensemanager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.14"
+const goModuleVersion = "1.29.15"
diff --git a/service/licensemanagerlinuxsubscriptions/CHANGELOG.md b/service/licensemanagerlinuxsubscriptions/CHANGELOG.md
index 2a8d10788ee..117c046ba3b 100644
--- a/service/licensemanagerlinuxsubscriptions/CHANGELOG.md
+++ b/service/licensemanagerlinuxsubscriptions/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/licensemanagerlinuxsubscriptions/go.mod b/service/licensemanagerlinuxsubscriptions/go.mod
index e49de89600c..7737226d400 100644
--- a/service/licensemanagerlinuxsubscriptions/go.mod
+++ b/service/licensemanagerlinuxsubscriptions/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/licensemanagerlinuxsubscriptions
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/licensemanagerlinuxsubscriptions/go_module_metadata.go b/service/licensemanagerlinuxsubscriptions/go_module_metadata.go
index 3a155942410..1e097d5db4d 100644
--- a/service/licensemanagerlinuxsubscriptions/go_module_metadata.go
+++ b/service/licensemanagerlinuxsubscriptions/go_module_metadata.go
@@ -3,4 +3,4 @@
 package licensemanagerlinuxsubscriptions
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.14"
+const goModuleVersion = "1.14.15"
diff --git a/service/licensemanagerusersubscriptions/CHANGELOG.md b/service/licensemanagerusersubscriptions/CHANGELOG.md
index a0c46057e26..2d9a4d4a798 100644
--- a/service/licensemanagerusersubscriptions/CHANGELOG.md
+++ b/service/licensemanagerusersubscriptions/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/licensemanagerusersubscriptions/go.mod b/service/licensemanagerusersubscriptions/go.mod
index 0f5da6df13d..46d5312125a 100644
--- a/service/licensemanagerusersubscriptions/go.mod
+++ b/service/licensemanagerusersubscriptions/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/licensemanagerusersubscriptions
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/licensemanagerusersubscriptions/go_module_metadata.go b/service/licensemanagerusersubscriptions/go_module_metadata.go
index 02bcf30b2bf..e07356f8264 100644
--- a/service/licensemanagerusersubscriptions/go_module_metadata.go
+++ b/service/licensemanagerusersubscriptions/go_module_metadata.go
@@ -3,4 +3,4 @@
 package licensemanagerusersubscriptions
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.8"
+const goModuleVersion = "1.14.9"
diff --git a/service/lightsail/CHANGELOG.md b/service/lightsail/CHANGELOG.md
index a6433cdb7a1..b37e53b8200 100644
--- a/service/lightsail/CHANGELOG.md
+++ b/service/lightsail/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.42.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.42.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lightsail/go.mod b/service/lightsail/go.mod
index 59a65f8b001..ff9bed766ca 100644
--- a/service/lightsail/go.mod
+++ b/service/lightsail/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lightsail
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lightsail/go_module_metadata.go b/service/lightsail/go_module_metadata.go
index ec6725c7ea4..e41ba52097a 100644
--- a/service/lightsail/go_module_metadata.go
+++ b/service/lightsail/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lightsail
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.42.13"
+const goModuleVersion = "1.42.14"
diff --git a/service/location/CHANGELOG.md b/service/location/CHANGELOG.md
index 4bddd8d57b0..b6fa6ba9a40 100644
--- a/service/location/CHANGELOG.md
+++ b/service/location/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.42.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.42.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/location/go.mod b/service/location/go.mod
index a75a18abe83..e4e3d35cf0e 100644
--- a/service/location/go.mod
+++ b/service/location/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/location
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/location/go_module_metadata.go b/service/location/go_module_metadata.go
index fe58ebfad8a..5b7ab8ee8d9 100644
--- a/service/location/go_module_metadata.go
+++ b/service/location/go_module_metadata.go
@@ -3,4 +3,4 @@
 package location
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.42.14"
+const goModuleVersion = "1.42.15"
diff --git a/service/lookoutequipment/CHANGELOG.md b/service/lookoutequipment/CHANGELOG.md
index 195f06a137f..2a7fdbcc5c6 100644
--- a/service/lookoutequipment/CHANGELOG.md
+++ b/service/lookoutequipment/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lookoutequipment/go.mod b/service/lookoutequipment/go.mod
index 34a360db3ed..81da35d90e2 100644
--- a/service/lookoutequipment/go.mod
+++ b/service/lookoutequipment/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lookoutequipment
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lookoutequipment/go_module_metadata.go b/service/lookoutequipment/go_module_metadata.go
index c61a2ebda23..08281c09f55 100644
--- a/service/lookoutequipment/go_module_metadata.go
+++ b/service/lookoutequipment/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lookoutequipment
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.13"
+const goModuleVersion = "1.30.14"
diff --git a/service/lookoutmetrics/CHANGELOG.md b/service/lookoutmetrics/CHANGELOG.md
index e4639509c0d..fcbfee93f38 100644
--- a/service/lookoutmetrics/CHANGELOG.md
+++ b/service/lookoutmetrics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lookoutmetrics/go.mod b/service/lookoutmetrics/go.mod
index 0f1038eea3b..7fdbab1ac97 100644
--- a/service/lookoutmetrics/go.mod
+++ b/service/lookoutmetrics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lookoutmetrics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lookoutmetrics/go_module_metadata.go b/service/lookoutmetrics/go_module_metadata.go
index a07b726b4df..0f402938972 100644
--- a/service/lookoutmetrics/go_module_metadata.go
+++ b/service/lookoutmetrics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lookoutmetrics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.13"
+const goModuleVersion = "1.31.14"
diff --git a/service/lookoutvision/CHANGELOG.md b/service/lookoutvision/CHANGELOG.md
index 766c61abd0b..f86243b8e7b 100644
--- a/service/lookoutvision/CHANGELOG.md
+++ b/service/lookoutvision/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/lookoutvision/go.mod b/service/lookoutvision/go.mod
index cb6b524a876..67658389af3 100644
--- a/service/lookoutvision/go.mod
+++ b/service/lookoutvision/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/lookoutvision
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/lookoutvision/go_module_metadata.go b/service/lookoutvision/go_module_metadata.go
index 1e0767e75c1..91daf88b409 100644
--- a/service/lookoutvision/go_module_metadata.go
+++ b/service/lookoutvision/go_module_metadata.go
@@ -3,4 +3,4 @@
 package lookoutvision
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/m2/CHANGELOG.md b/service/m2/CHANGELOG.md
index 0d10bb1e4df..2cb11d7888a 100644
--- a/service/m2/CHANGELOG.md
+++ b/service/m2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.19.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.19.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/m2/go.mod b/service/m2/go.mod
index f731f2218a1..bf04b3cdfa2 100644
--- a/service/m2/go.mod
+++ b/service/m2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/m2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/m2/go_module_metadata.go b/service/m2/go_module_metadata.go
index a46b876c81e..5c1e2564b5d 100644
--- a/service/m2/go_module_metadata.go
+++ b/service/m2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package m2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.19.6"
+const goModuleVersion = "1.19.7"
diff --git a/service/machinelearning/CHANGELOG.md b/service/machinelearning/CHANGELOG.md
index f7d0e6e6aea..530b7501300 100644
--- a/service/machinelearning/CHANGELOG.md
+++ b/service/machinelearning/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.28.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/machinelearning/api_op_DescribeBatchPredictions.go b/service/machinelearning/api_op_DescribeBatchPredictions.go
index 930e160a03b..53de98d1ff9 100644
--- a/service/machinelearning/api_op_DescribeBatchPredictions.go
+++ b/service/machinelearning/api_op_DescribeBatchPredictions.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -391,29 +390,18 @@ func (w *BatchPredictionAvailableWaiter) WaitForOutput(ctx context.Context, para
 func batchPredictionAvailableStateRetryable(ctx context.Context, input *DescribeBatchPredictionsInput, output *DescribeBatchPredictionsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "COMPLETED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -423,26 +411,23 @@ func batchPredictionAvailableStateRetryable(ctx context.Context, input *Describe
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/machinelearning/api_op_DescribeDataSources.go b/service/machinelearning/api_op_DescribeDataSources.go
index 47f4e36d547..01a1042caa1 100644
--- a/service/machinelearning/api_op_DescribeDataSources.go
+++ b/service/machinelearning/api_op_DescribeDataSources.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -383,29 +382,18 @@ func (w *DataSourceAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func dataSourceAvailableStateRetryable(ctx context.Context, input *DescribeDataSourcesInput, output *DescribeDataSourcesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "COMPLETED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -415,26 +403,23 @@ func dataSourceAvailableStateRetryable(ctx context.Context, input *DescribeDataS
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/machinelearning/api_op_DescribeEvaluations.go b/service/machinelearning/api_op_DescribeEvaluations.go
index e12d8ef28a8..343d6e6ce74 100644
--- a/service/machinelearning/api_op_DescribeEvaluations.go
+++ b/service/machinelearning/api_op_DescribeEvaluations.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -389,29 +388,18 @@ func (w *EvaluationAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func evaluationAvailableStateRetryable(ctx context.Context, input *DescribeEvaluationsInput, output *DescribeEvaluationsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "COMPLETED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -421,26 +409,23 @@ func evaluationAvailableStateRetryable(ctx context.Context, input *DescribeEvalu
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/machinelearning/api_op_DescribeMLModels.go b/service/machinelearning/api_op_DescribeMLModels.go
index 261416a87ce..717b900b05f 100644
--- a/service/machinelearning/api_op_DescribeMLModels.go
+++ b/service/machinelearning/api_op_DescribeMLModels.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -392,29 +391,18 @@ func (w *MLModelAvailableWaiter) WaitForOutput(ctx context.Context, params *Desc
 func mLModelAvailableStateRetryable(ctx context.Context, input *DescribeMLModelsInput, output *DescribeMLModelsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "COMPLETED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -424,26 +412,23 @@ func mLModelAvailableStateRetryable(ctx context.Context, input *DescribeMLModels
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Results[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Results
+		var v2 []types.EntityStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.EntityStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.EntityStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/machinelearning/generated.json b/service/machinelearning/generated.json
index 617c3286002..390fa109d9e 100644
--- a/service/machinelearning/generated.json
+++ b/service/machinelearning/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/machinelearning/go.mod b/service/machinelearning/go.mod
index 246a6aeaf62..c7156267799 100644
--- a/service/machinelearning/go.mod
+++ b/service/machinelearning/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/machinelearning
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/machinelearning/go.sum b/service/machinelearning/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/machinelearning/go.sum
+++ b/service/machinelearning/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/machinelearning/go_module_metadata.go b/service/machinelearning/go_module_metadata.go
index b3e5ed2c32b..594df30ebd5 100644
--- a/service/machinelearning/go_module_metadata.go
+++ b/service/machinelearning/go_module_metadata.go
@@ -3,4 +3,4 @@
 package machinelearning
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.14"
+const goModuleVersion = "1.28.15"
diff --git a/service/macie2/CHANGELOG.md b/service/macie2/CHANGELOG.md
index 8d7f8dd90ad..c4fa85040b8 100644
--- a/service/macie2/CHANGELOG.md
+++ b/service/macie2/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.44.8 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.44.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/macie2/api_op_GetSensitiveDataOccurrences.go b/service/macie2/api_op_GetSensitiveDataOccurrences.go
index 57c90692918..6c44b2fee5a 100644
--- a/service/macie2/api_op_GetSensitiveDataOccurrences.go
+++ b/service/macie2/api_op_GetSensitiveDataOccurrences.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -332,35 +331,21 @@ func (w *FindingRevealedWaiter) WaitForOutput(ctx context.Context, params *GetSe
 func findingRevealedStateRetryable(ctx context.Context, input *GetSensitiveDataOccurrencesInput, output *GetSensitiveDataOccurrencesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUCCESS"
-		value, ok := pathValue.(types.RevealRequestStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RevealRequestStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ERROR"
-		value, ok := pathValue.(types.RevealRequestStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RevealRequestStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/macie2/generated.json b/service/macie2/generated.json
index fc3a0bad281..473400df7dd 100644
--- a/service/macie2/generated.json
+++ b/service/macie2/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/macie2/go.mod b/service/macie2/go.mod
index 9b2c17c6aa2..72a849ddabf 100644
--- a/service/macie2/go.mod
+++ b/service/macie2/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/macie2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/macie2/go.sum b/service/macie2/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/macie2/go.sum
+++ b/service/macie2/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/macie2/go_module_metadata.go b/service/macie2/go_module_metadata.go
index 083c139f7cd..c38d493ca64 100644
--- a/service/macie2/go_module_metadata.go
+++ b/service/macie2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package macie2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.7"
+const goModuleVersion = "1.44.8"
diff --git a/service/mailmanager/CHANGELOG.md b/service/mailmanager/CHANGELOG.md
index 0f57cdff5b8..44924f52379 100644
--- a/service/mailmanager/CHANGELOG.md
+++ b/service/mailmanager/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mailmanager/go.mod b/service/mailmanager/go.mod
index 0fc2a822d33..5f9866486b3 100644
--- a/service/mailmanager/go.mod
+++ b/service/mailmanager/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mailmanager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mailmanager/go_module_metadata.go b/service/mailmanager/go_module_metadata.go
index e376c03c660..fedcb2e8b85 100644
--- a/service/mailmanager/go_module_metadata.go
+++ b/service/mailmanager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mailmanager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.1"
+const goModuleVersion = "1.8.2"
diff --git a/service/managedblockchain/CHANGELOG.md b/service/managedblockchain/CHANGELOG.md
index 24b57387918..0d8f35c30bf 100644
--- a/service/managedblockchain/CHANGELOG.md
+++ b/service/managedblockchain/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/managedblockchain/go.mod b/service/managedblockchain/go.mod
index 5810d2bb06a..80678a41f98 100644
--- a/service/managedblockchain/go.mod
+++ b/service/managedblockchain/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/managedblockchain
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/managedblockchain/go_module_metadata.go b/service/managedblockchain/go_module_metadata.go
index eca0ee474b0..5e0ea988255 100644
--- a/service/managedblockchain/go_module_metadata.go
+++ b/service/managedblockchain/go_module_metadata.go
@@ -3,4 +3,4 @@
 package managedblockchain
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/managedblockchainquery/CHANGELOG.md b/service/managedblockchainquery/CHANGELOG.md
index dd954cea154..0b4c7209724 100644
--- a/service/managedblockchainquery/CHANGELOG.md
+++ b/service/managedblockchainquery/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/managedblockchainquery/go.mod b/service/managedblockchainquery/go.mod
index 77b0d607496..9cd28ab0401 100644
--- a/service/managedblockchainquery/go.mod
+++ b/service/managedblockchainquery/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/managedblockchainquery
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/managedblockchainquery/go_module_metadata.go b/service/managedblockchainquery/go_module_metadata.go
index d9422ca4380..b4c25efa02e 100644
--- a/service/managedblockchainquery/go_module_metadata.go
+++ b/service/managedblockchainquery/go_module_metadata.go
@@ -3,4 +3,4 @@
 package managedblockchainquery
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.13"
+const goModuleVersion = "1.16.14"
diff --git a/service/marketplaceagreement/CHANGELOG.md b/service/marketplaceagreement/CHANGELOG.md
index f34cabf5eba..2a8133f5e5f 100644
--- a/service/marketplaceagreement/CHANGELOG.md
+++ b/service/marketplaceagreement/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.6.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.6.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplaceagreement/go.mod b/service/marketplaceagreement/go.mod
index 5aaefc251c3..6c7f7cd742f 100644
--- a/service/marketplaceagreement/go.mod
+++ b/service/marketplaceagreement/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplaceagreement
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplaceagreement/go_module_metadata.go b/service/marketplaceagreement/go_module_metadata.go
index 909fca8f9a4..649104846b5 100644
--- a/service/marketplaceagreement/go_module_metadata.go
+++ b/service/marketplaceagreement/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplaceagreement
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.6.14"
+const goModuleVersion = "1.6.15"
diff --git a/service/marketplacecatalog/CHANGELOG.md b/service/marketplacecatalog/CHANGELOG.md
index 1cb0edaef3f..8dfdf6451cb 100644
--- a/service/marketplacecatalog/CHANGELOG.md
+++ b/service/marketplacecatalog/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplacecatalog/go.mod b/service/marketplacecatalog/go.mod
index a96097478d1..da5e410d295 100644
--- a/service/marketplacecatalog/go.mod
+++ b/service/marketplacecatalog/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacecatalog
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplacecatalog/go_module_metadata.go b/service/marketplacecatalog/go_module_metadata.go
index 736dbe27063..49a99be7fb6 100644
--- a/service/marketplacecatalog/go_module_metadata.go
+++ b/service/marketplacecatalog/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplacecatalog
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.13"
+const goModuleVersion = "1.30.14"
diff --git a/service/marketplacecommerceanalytics/CHANGELOG.md b/service/marketplacecommerceanalytics/CHANGELOG.md
index fc78924da87..76fa3f6fd18 100644
--- a/service/marketplacecommerceanalytics/CHANGELOG.md
+++ b/service/marketplacecommerceanalytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplacecommerceanalytics/go.mod b/service/marketplacecommerceanalytics/go.mod
index c78356ff377..bb52dfb59fc 100644
--- a/service/marketplacecommerceanalytics/go.mod
+++ b/service/marketplacecommerceanalytics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacecommerceanalytics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplacecommerceanalytics/go_module_metadata.go b/service/marketplacecommerceanalytics/go_module_metadata.go
index 283f0f90f82..2591ccd968d 100644
--- a/service/marketplacecommerceanalytics/go_module_metadata.go
+++ b/service/marketplacecommerceanalytics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplacecommerceanalytics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/marketplacedeployment/CHANGELOG.md b/service/marketplacedeployment/CHANGELOG.md
index 8e69ca1210f..b0ba05cf793 100644
--- a/service/marketplacedeployment/CHANGELOG.md
+++ b/service/marketplacedeployment/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.6.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.6.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplacedeployment/go.mod b/service/marketplacedeployment/go.mod
index d21846ff302..fd6d674b1b6 100644
--- a/service/marketplacedeployment/go.mod
+++ b/service/marketplacedeployment/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacedeployment
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplacedeployment/go_module_metadata.go b/service/marketplacedeployment/go_module_metadata.go
index 06798d862cb..782bbc5a2bf 100644
--- a/service/marketplacedeployment/go_module_metadata.go
+++ b/service/marketplacedeployment/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplacedeployment
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.6.13"
+const goModuleVersion = "1.6.14"
diff --git a/service/marketplaceentitlementservice/CHANGELOG.md b/service/marketplaceentitlementservice/CHANGELOG.md
index bd6133fce75..6ccfb26cbee 100644
--- a/service/marketplaceentitlementservice/CHANGELOG.md
+++ b/service/marketplaceentitlementservice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplaceentitlementservice/go.mod b/service/marketplaceentitlementservice/go.mod
index 0a201571ecd..e3a17c86e3a 100644
--- a/service/marketplaceentitlementservice/go.mod
+++ b/service/marketplaceentitlementservice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplaceentitlementservice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplaceentitlementservice/go_module_metadata.go b/service/marketplaceentitlementservice/go_module_metadata.go
index a2b6ecf9b41..26d6b78a0a0 100644
--- a/service/marketplaceentitlementservice/go_module_metadata.go
+++ b/service/marketplaceentitlementservice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplaceentitlementservice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/marketplacemetering/CHANGELOG.md b/service/marketplacemetering/CHANGELOG.md
index 4e87da5386a..015fd0e5cef 100644
--- a/service/marketplacemetering/CHANGELOG.md
+++ b/service/marketplacemetering/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplacemetering/go.mod b/service/marketplacemetering/go.mod
index 715699b5d98..0a24f319786 100644
--- a/service/marketplacemetering/go.mod
+++ b/service/marketplacemetering/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacemetering
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplacemetering/go_module_metadata.go b/service/marketplacemetering/go_module_metadata.go
index 3843f532bd5..c9c899b16b8 100644
--- a/service/marketplacemetering/go_module_metadata.go
+++ b/service/marketplacemetering/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplacemetering
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/marketplacereporting/CHANGELOG.md b/service/marketplacereporting/CHANGELOG.md
index 84518a94bce..3da2852a3ab 100644
--- a/service/marketplacereporting/CHANGELOG.md
+++ b/service/marketplacereporting/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/marketplacereporting/go.mod b/service/marketplacereporting/go.mod
index 022daad9d4b..6a33d04e47e 100644
--- a/service/marketplacereporting/go.mod
+++ b/service/marketplacereporting/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/marketplacereporting
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/marketplacereporting/go_module_metadata.go b/service/marketplacereporting/go_module_metadata.go
index 1da880b2360..23129b68c39 100644
--- a/service/marketplacereporting/go_module_metadata.go
+++ b/service/marketplacereporting/go_module_metadata.go
@@ -3,4 +3,4 @@
 package marketplacereporting
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.13"
+const goModuleVersion = "1.1.14"
diff --git a/service/mediaconnect/CHANGELOG.md b/service/mediaconnect/CHANGELOG.md
index c5d0d35df49..08f4ffa45a7 100644
--- a/service/mediaconnect/CHANGELOG.md
+++ b/service/mediaconnect/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.37.7 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediaconnect/api_op_DescribeFlow.go b/service/mediaconnect/api_op_DescribeFlow.go
index 4c0efe7ba4a..912b87e83f6 100644
--- a/service/mediaconnect/api_op_DescribeFlow.go
+++ b/service/mediaconnect/api_op_DescribeFlow.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -317,52 +316,46 @@ func (w *FlowActiveWaiter) WaitForOutput(ctx context.Context, params *DescribeFl
 func flowActiveStateRetryable(ctx context.Context, input *DescribeFlowInput, output *DescribeFlowOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -382,18 +375,16 @@ func flowActiveStateRetryable(ctx context.Context, input *DescribeFlowInput, out
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ERROR"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -570,18 +561,16 @@ func flowDeletedStateRetryable(ctx context.Context, input *DescribeFlowInput, ou
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -601,18 +590,16 @@ func flowDeletedStateRetryable(ctx context.Context, input *DescribeFlowInput, ou
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ERROR"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -782,35 +769,31 @@ func (w *FlowStandbyWaiter) WaitForOutput(ctx context.Context, params *DescribeF
 func flowStandbyStateRetryable(ctx context.Context, input *DescribeFlowInput, output *DescribeFlowOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "STANDBY"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "STOPPING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -830,18 +813,16 @@ func flowStandbyStateRetryable(ctx context.Context, input *DescribeFlowInput, ou
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Flow.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Flow
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ERROR"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/mediaconnect/generated.json b/service/mediaconnect/generated.json
index 5ba297580cc..01a2afed786 100644
--- a/service/mediaconnect/generated.json
+++ b/service/mediaconnect/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/mediaconnect/go.mod b/service/mediaconnect/go.mod
index ebd26f7e3e6..1061d75e225 100644
--- a/service/mediaconnect/go.mod
+++ b/service/mediaconnect/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/mediaconnect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/mediaconnect/go.sum b/service/mediaconnect/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/mediaconnect/go.sum
+++ b/service/mediaconnect/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/mediaconnect/go_module_metadata.go b/service/mediaconnect/go_module_metadata.go
index c0374def942..abb2bd004ef 100644
--- a/service/mediaconnect/go_module_metadata.go
+++ b/service/mediaconnect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediaconnect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.6"
+const goModuleVersion = "1.37.7"
diff --git a/service/mediaconvert/CHANGELOG.md b/service/mediaconvert/CHANGELOG.md
index 255e5abd2f6..98a4e9edafa 100644
--- a/service/mediaconvert/CHANGELOG.md
+++ b/service/mediaconvert/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.66.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.66.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediaconvert/go.mod b/service/mediaconvert/go.mod
index 72a58bfc6d1..fa51aedcc94 100644
--- a/service/mediaconvert/go.mod
+++ b/service/mediaconvert/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediaconvert
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediaconvert/go_module_metadata.go b/service/mediaconvert/go_module_metadata.go
index 6df5cefb5d6..15df89eb6fe 100644
--- a/service/mediaconvert/go_module_metadata.go
+++ b/service/mediaconvert/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediaconvert
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.66.1"
+const goModuleVersion = "1.66.2"
diff --git a/service/medialive/CHANGELOG.md b/service/medialive/CHANGELOG.md
index 89e19c39679..37c98211d96 100644
--- a/service/medialive/CHANGELOG.md
+++ b/service/medialive/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.66.3 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.66.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/medialive/api_op_DescribeChannel.go b/service/medialive/api_op_DescribeChannel.go
index 68ce55c38fc..4fd9c304f5a 100644
--- a/service/medialive/api_op_DescribeChannel.go
+++ b/service/medialive/api_op_DescribeChannel.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -375,35 +374,21 @@ func (w *ChannelCreatedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func channelCreatedStateRetryable(ctx context.Context, input *DescribeChannelInput, output *DescribeChannelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "IDLE"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -416,18 +401,11 @@ func channelCreatedStateRetryable(ctx context.Context, input *DescribeChannelInp
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -598,35 +576,21 @@ func (w *ChannelDeletedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func channelDeletedStateRetryable(ctx context.Context, input *DescribeChannelInput, output *DescribeChannelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -804,35 +768,21 @@ func (w *ChannelRunningWaiter) WaitForOutput(ctx context.Context, params *Descri
 func channelRunningStateRetryable(ctx context.Context, input *DescribeChannelInput, output *DescribeChannelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -1010,35 +960,21 @@ func (w *ChannelStoppedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func channelStoppedStateRetryable(ctx context.Context, input *DescribeChannelInput, output *DescribeChannelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "IDLE"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "STOPPING"
-		value, ok := pathValue.(types.ChannelState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/medialive/api_op_DescribeChannelPlacementGroup.go b/service/medialive/api_op_DescribeChannelPlacementGroup.go
index 1d981019d31..be25a2d5f41 100644
--- a/service/medialive/api_op_DescribeChannelPlacementGroup.go
+++ b/service/medialive/api_op_DescribeChannelPlacementGroup.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -345,35 +344,21 @@ func (w *ChannelPlacementGroupAssignedWaiter) WaitForOutput(ctx context.Context,
 func channelPlacementGroupAssignedStateRetryable(ctx context.Context, input *DescribeChannelPlacementGroupInput, output *DescribeChannelPlacementGroupOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ASSIGNED"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ASSIGNING"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -555,35 +540,21 @@ func (w *ChannelPlacementGroupDeletedWaiter) WaitForOutput(ctx context.Context,
 func channelPlacementGroupDeletedStateRetryable(ctx context.Context, input *DescribeChannelPlacementGroupInput, output *DescribeChannelPlacementGroupOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -766,35 +737,21 @@ func (w *ChannelPlacementGroupUnassignedWaiter) WaitForOutput(ctx context.Contex
 func channelPlacementGroupUnassignedStateRetryable(ctx context.Context, input *DescribeChannelPlacementGroupInput, output *DescribeChannelPlacementGroupOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "UNASSIGNED"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "UNASSIGNING"
-		value, ok := pathValue.(types.ChannelPlacementGroupState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChannelPlacementGroupState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/medialive/api_op_DescribeCluster.go b/service/medialive/api_op_DescribeCluster.go
index 5de83ec3015..416af2b5863 100644
--- a/service/medialive/api_op_DescribeCluster.go
+++ b/service/medialive/api_op_DescribeCluster.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -341,35 +340,21 @@ func (w *ClusterCreatedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func clusterCreatedStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -382,18 +367,11 @@ func clusterCreatedStateRetryable(ctx context.Context, input *DescribeClusterInp
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -564,35 +542,21 @@ func (w *ClusterDeletedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.ClusterState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ClusterState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/medialive/api_op_DescribeInput.go b/service/medialive/api_op_DescribeInput.go
index 01946d77d5a..348b814e778 100644
--- a/service/medialive/api_op_DescribeInput.go
+++ b/service/medialive/api_op_DescribeInput.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -380,35 +379,21 @@ func (w *InputAttachedWaiter) WaitForOutput(ctx context.Context, params *Describ
 func inputAttachedStateRetryable(ctx context.Context, input *DescribeInputInput, output *DescribeInputOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ATTACHED"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DETACHED"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -585,35 +570,21 @@ func (w *InputDeletedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func inputDeletedStateRetryable(ctx context.Context, input *DescribeInputInput, output *DescribeInputOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -791,52 +762,31 @@ func (w *InputDetachedWaiter) WaitForOutput(ctx context.Context, params *Describ
 func inputDetachedStateRetryable(ctx context.Context, input *DescribeInputInput, output *DescribeInputOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DETACHED"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ATTACHED"
-		value, ok := pathValue.(types.InputState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.InputState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/medialive/api_op_DescribeMultiplex.go b/service/medialive/api_op_DescribeMultiplex.go
index cc10ef5d257..c19a8c67c4b 100644
--- a/service/medialive/api_op_DescribeMultiplex.go
+++ b/service/medialive/api_op_DescribeMultiplex.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -342,35 +341,21 @@ func (w *MultiplexCreatedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func multiplexCreatedStateRetryable(ctx context.Context, input *DescribeMultiplexInput, output *DescribeMultiplexOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "IDLE"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -383,18 +368,11 @@ func multiplexCreatedStateRetryable(ctx context.Context, input *DescribeMultiple
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -565,35 +543,21 @@ func (w *MultiplexDeletedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func multiplexDeletedStateRetryable(ctx context.Context, input *DescribeMultiplexInput, output *DescribeMultiplexOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -771,35 +735,21 @@ func (w *MultiplexRunningWaiter) WaitForOutput(ctx context.Context, params *Desc
 func multiplexRunningStateRetryable(ctx context.Context, input *DescribeMultiplexInput, output *DescribeMultiplexOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -977,35 +927,21 @@ func (w *MultiplexStoppedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func multiplexStoppedStateRetryable(ctx context.Context, input *DescribeMultiplexInput, output *DescribeMultiplexOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "IDLE"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "STOPPING"
-		value, ok := pathValue.(types.MultiplexState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.MultiplexState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/medialive/api_op_DescribeNode.go b/service/medialive/api_op_DescribeNode.go
index d662773753e..79cc5a967be 100644
--- a/service/medialive/api_op_DescribeNode.go
+++ b/service/medialive/api_op_DescribeNode.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -351,52 +350,31 @@ func (w *NodeDeregisteredWaiter) WaitForOutput(ctx context.Context, params *Desc
 func nodeDeregisteredStateRetryable(ctx context.Context, input *DescribeNodeInput, output *DescribeNodeOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DEREGISTERED"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DEREGISTERING"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "DRAINING"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -574,35 +552,21 @@ func (w *NodeRegisteredWaiter) WaitForOutput(ctx context.Context, params *Descri
 func nodeRegisteredStateRetryable(ctx context.Context, input *DescribeNodeInput, output *DescribeNodeOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "REGISTERING"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -615,18 +579,11 @@ func nodeRegisteredStateRetryable(ctx context.Context, input *DescribeNodeInput,
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.State
 		expectedValue := "REGISTRATION_FAILED"
-		value, ok := pathValue.(types.NodeState)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeState value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/medialive/api_op_GetSignalMap.go b/service/medialive/api_op_GetSignalMap.go
index 044ee314545..5d39559df75 100644
--- a/service/medialive/api_op_GetSignalMap.go
+++ b/service/medialive/api_op_GetSignalMap.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -369,52 +368,31 @@ func (w *SignalMapCreatedWaiter) WaitForOutput(ctx context.Context, params *GetS
 func signalMapCreatedStateRetryable(ctx context.Context, input *GetSignalMapInput, output *GetSignalMapOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_COMPLETE"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_IN_PROGRESS"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -587,52 +565,46 @@ func (w *SignalMapMonitorDeletedWaiter) WaitForOutput(ctx context.Context, param
 func signalMapMonitorDeletedStateRetryable(ctx context.Context, input *GetSignalMapInput, output *GetSignalMapOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_COMPLETE"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_IN_PROGRESS"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -805,103 +777,91 @@ func (w *SignalMapMonitorDeployedWaiter) WaitForOutput(ctx context.Context, para
 func signalMapMonitorDeployedStateRetryable(ctx context.Context, input *GetSignalMapInput, output *GetSignalMapOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DRY_RUN_DEPLOYMENT_COMPLETE"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYMENT_COMPLETE"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DRY_RUN_DEPLOYMENT_IN_PROGRESS"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYMENT_IN_PROGRESS"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DRY_RUN_DEPLOYMENT_FAILED"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("MonitorDeployment.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.MonitorDeployment
+		var v2 types.SignalMapMonitorDeploymentStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYMENT_FAILED"
-		value, ok := pathValue.(types.SignalMapMonitorDeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapMonitorDeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -1072,69 +1032,41 @@ func (w *SignalMapUpdatedWaiter) WaitForOutput(ctx context.Context, params *GetS
 func signalMapUpdatedStateRetryable(ctx context.Context, input *GetSignalMapInput, output *GetSignalMapOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATE_COMPLETE"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATE_IN_PROGRESS"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATE_FAILED"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATE_REVERTED"
-		value, ok := pathValue.(types.SignalMapStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SignalMapStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/medialive/generated.json b/service/medialive/generated.json
index 5047cb36fdb..5f0d7de7c5d 100644
--- a/service/medialive/generated.json
+++ b/service/medialive/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/medialive/go.mod b/service/medialive/go.mod
index e60bb564df0..09ca168cf32 100644
--- a/service/medialive/go.mod
+++ b/service/medialive/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/medialive
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/medialive/go.sum b/service/medialive/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/medialive/go.sum
+++ b/service/medialive/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/medialive/go_module_metadata.go b/service/medialive/go_module_metadata.go
index 3b310ce7bdd..e01afef80d1 100644
--- a/service/medialive/go_module_metadata.go
+++ b/service/medialive/go_module_metadata.go
@@ -3,4 +3,4 @@
 package medialive
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.66.2"
+const goModuleVersion = "1.66.3"
diff --git a/service/mediapackage/CHANGELOG.md b/service/mediapackage/CHANGELOG.md
index 9f033f96b07..5694d5c0c2d 100644
--- a/service/mediapackage/CHANGELOG.md
+++ b/service/mediapackage/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediapackage/go.mod b/service/mediapackage/go.mod
index 6196da0a727..f37414caa5a 100644
--- a/service/mediapackage/go.mod
+++ b/service/mediapackage/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediapackage
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediapackage/go_module_metadata.go b/service/mediapackage/go_module_metadata.go
index 89c7995f3ff..226a4fba79a 100644
--- a/service/mediapackage/go_module_metadata.go
+++ b/service/mediapackage/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediapackage
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/mediapackagev2/CHANGELOG.md b/service/mediapackagev2/CHANGELOG.md
index e68faf9dc63..095a284c2f3 100644
--- a/service/mediapackagev2/CHANGELOG.md
+++ b/service/mediapackagev2/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.20.9 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediapackagev2/api_op_GetHarvestJob.go b/service/mediapackagev2/api_op_GetHarvestJob.go
index 23e88eac9e5..f25f43b8530 100644
--- a/service/mediapackagev2/api_op_GetHarvestJob.go
+++ b/service/mediapackagev2/api_op_GetHarvestJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -397,86 +396,51 @@ func (w *HarvestJobFinishedWaiter) WaitForOutput(ctx context.Context, params *Ge
 func harvestJobFinishedStateRetryable(ctx context.Context, input *GetHarvestJobInput, output *GetHarvestJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.HarvestJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.HarvestJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.HarvestJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.HarvestJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.HarvestJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.HarvestJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "QUEUED"
-		value, ok := pathValue.(types.HarvestJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.HarvestJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.HarvestJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.HarvestJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/mediapackagev2/generated.json b/service/mediapackagev2/generated.json
index ac2472eb7b6..48756f535d5 100644
--- a/service/mediapackagev2/generated.json
+++ b/service/mediapackagev2/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/mediapackagev2/go.mod b/service/mediapackagev2/go.mod
index 162c61ac644..ac7cc9d9ec6 100644
--- a/service/mediapackagev2/go.mod
+++ b/service/mediapackagev2/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/mediapackagev2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/mediapackagev2/go.sum b/service/mediapackagev2/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/mediapackagev2/go.sum
+++ b/service/mediapackagev2/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/mediapackagev2/go_module_metadata.go b/service/mediapackagev2/go_module_metadata.go
index 63f098ddf0b..313075f1496 100644
--- a/service/mediapackagev2/go_module_metadata.go
+++ b/service/mediapackagev2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediapackagev2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.8"
+const goModuleVersion = "1.20.9"
diff --git a/service/mediapackagevod/CHANGELOG.md b/service/mediapackagevod/CHANGELOG.md
index 7ebd8586688..2f4b566d1c7 100644
--- a/service/mediapackagevod/CHANGELOG.md
+++ b/service/mediapackagevod/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediapackagevod/go.mod b/service/mediapackagevod/go.mod
index 11b321fa6a0..eda5e3a9b16 100644
--- a/service/mediapackagevod/go.mod
+++ b/service/mediapackagevod/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediapackagevod
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediapackagevod/go_module_metadata.go b/service/mediapackagevod/go_module_metadata.go
index e85c8253165..c8be4a76ec5 100644
--- a/service/mediapackagevod/go_module_metadata.go
+++ b/service/mediapackagevod/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediapackagevod
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.14"
+const goModuleVersion = "1.34.15"
diff --git a/service/mediastore/CHANGELOG.md b/service/mediastore/CHANGELOG.md
index eb489dc88d8..976e1106740 100644
--- a/service/mediastore/CHANGELOG.md
+++ b/service/mediastore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediastore/go.mod b/service/mediastore/go.mod
index a6c17d8de27..14e7791e7bd 100644
--- a/service/mediastore/go.mod
+++ b/service/mediastore/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediastore
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediastore/go_module_metadata.go b/service/mediastore/go_module_metadata.go
index 78d133ee3d4..bd794ec56f4 100644
--- a/service/mediastore/go_module_metadata.go
+++ b/service/mediastore/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediastore
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/mediastoredata/CHANGELOG.md b/service/mediastoredata/CHANGELOG.md
index b311f1719d0..15346f3dc05 100644
--- a/service/mediastoredata/CHANGELOG.md
+++ b/service/mediastoredata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mediastoredata/go.mod b/service/mediastoredata/go.mod
index 4838571aaa6..4d4ca3b9a9f 100644
--- a/service/mediastoredata/go.mod
+++ b/service/mediastoredata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediastoredata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediastoredata/go_module_metadata.go b/service/mediastoredata/go_module_metadata.go
index 647f02f822b..913035df7b4 100644
--- a/service/mediastoredata/go_module_metadata.go
+++ b/service/mediastoredata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediastoredata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/mediatailor/CHANGELOG.md b/service/mediatailor/CHANGELOG.md
index 4ca76050131..6906c4af6f7 100644
--- a/service/mediatailor/CHANGELOG.md
+++ b/service/mediatailor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.43.1 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.43.0 (2025-01-30)
 
 * **Feature**: Adds options for configuring how MediaTailor conditions ads before inserting them into the content stream. Based on the new settings, MediaTailor will either transcode ads to match the content stream as it has in the past, or it will insert ads without first transcoding them.
diff --git a/service/mediatailor/go.mod b/service/mediatailor/go.mod
index d65084c70c6..7a2aa529cdc 100644
--- a/service/mediatailor/go.mod
+++ b/service/mediatailor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mediatailor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mediatailor/go_module_metadata.go b/service/mediatailor/go_module_metadata.go
index 9b975a02eca..feff543e150 100644
--- a/service/mediatailor/go_module_metadata.go
+++ b/service/mediatailor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mediatailor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.43.0"
+const goModuleVersion = "1.43.1"
diff --git a/service/medicalimaging/CHANGELOG.md b/service/medicalimaging/CHANGELOG.md
index 60bd993fdd3..b8874b682b6 100644
--- a/service/medicalimaging/CHANGELOG.md
+++ b/service/medicalimaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/medicalimaging/go.mod b/service/medicalimaging/go.mod
index 142be98db55..abcc7b2030e 100644
--- a/service/medicalimaging/go.mod
+++ b/service/medicalimaging/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/medicalimaging
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/medicalimaging/go_module_metadata.go b/service/medicalimaging/go_module_metadata.go
index 968639a4f08..98a7970e277 100644
--- a/service/medicalimaging/go_module_metadata.go
+++ b/service/medicalimaging/go_module_metadata.go
@@ -3,4 +3,4 @@
 package medicalimaging
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.13"
+const goModuleVersion = "1.14.14"
diff --git a/service/memorydb/CHANGELOG.md b/service/memorydb/CHANGELOG.md
index 1b00ee89976..0b6f29fdb8e 100644
--- a/service/memorydb/CHANGELOG.md
+++ b/service/memorydb/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/memorydb/go.mod b/service/memorydb/go.mod
index c098d3b35ed..ba90721a526 100644
--- a/service/memorydb/go.mod
+++ b/service/memorydb/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/memorydb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/memorydb/go_module_metadata.go b/service/memorydb/go_module_metadata.go
index 8c107a696d2..56029480dc5 100644
--- a/service/memorydb/go_module_metadata.go
+++ b/service/memorydb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package memorydb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.6"
+const goModuleVersion = "1.25.7"
diff --git a/service/mgn/CHANGELOG.md b/service/mgn/CHANGELOG.md
index f90948d9c3b..488b70238b9 100644
--- a/service/mgn/CHANGELOG.md
+++ b/service/mgn/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mgn/go.mod b/service/mgn/go.mod
index 252d5fcf839..f3407f3e83a 100644
--- a/service/mgn/go.mod
+++ b/service/mgn/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mgn
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mgn/go_module_metadata.go b/service/mgn/go_module_metadata.go
index 93c73b4f388..c3306408060 100644
--- a/service/mgn/go_module_metadata.go
+++ b/service/mgn/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mgn
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.13"
+const goModuleVersion = "1.32.14"
diff --git a/service/migrationhub/CHANGELOG.md b/service/migrationhub/CHANGELOG.md
index 03369be3f14..2b44774be1d 100644
--- a/service/migrationhub/CHANGELOG.md
+++ b/service/migrationhub/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/migrationhub/go.mod b/service/migrationhub/go.mod
index 59551876ff7..90607bc36cc 100644
--- a/service/migrationhub/go.mod
+++ b/service/migrationhub/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhub
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/migrationhub/go_module_metadata.go b/service/migrationhub/go_module_metadata.go
index 1dedd356d08..34d9ecebd30 100644
--- a/service/migrationhub/go_module_metadata.go
+++ b/service/migrationhub/go_module_metadata.go
@@ -3,4 +3,4 @@
 package migrationhub
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.6"
+const goModuleVersion = "1.25.7"
diff --git a/service/migrationhubconfig/CHANGELOG.md b/service/migrationhubconfig/CHANGELOG.md
index 0b707704ffb..b273024df68 100644
--- a/service/migrationhubconfig/CHANGELOG.md
+++ b/service/migrationhubconfig/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/migrationhubconfig/go.mod b/service/migrationhubconfig/go.mod
index 244e7becc10..eb3f1c9d1c0 100644
--- a/service/migrationhubconfig/go.mod
+++ b/service/migrationhubconfig/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhubconfig
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/migrationhubconfig/go_module_metadata.go b/service/migrationhubconfig/go_module_metadata.go
index a212ec3c6e5..02cd5998f96 100644
--- a/service/migrationhubconfig/go_module_metadata.go
+++ b/service/migrationhubconfig/go_module_metadata.go
@@ -3,4 +3,4 @@
 package migrationhubconfig
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/migrationhuborchestrator/CHANGELOG.md b/service/migrationhuborchestrator/CHANGELOG.md
index 6118a7531fe..9865cd5f750 100644
--- a/service/migrationhuborchestrator/CHANGELOG.md
+++ b/service/migrationhuborchestrator/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.13.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.13.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/migrationhuborchestrator/go.mod b/service/migrationhuborchestrator/go.mod
index 2e9e1d55497..38a9c4f5beb 100644
--- a/service/migrationhuborchestrator/go.mod
+++ b/service/migrationhuborchestrator/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhuborchestrator
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/migrationhuborchestrator/go_module_metadata.go b/service/migrationhuborchestrator/go_module_metadata.go
index 1edea667be8..346ae582847 100644
--- a/service/migrationhuborchestrator/go_module_metadata.go
+++ b/service/migrationhuborchestrator/go_module_metadata.go
@@ -3,4 +3,4 @@
 package migrationhuborchestrator
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.13.13"
+const goModuleVersion = "1.13.14"
diff --git a/service/migrationhubrefactorspaces/CHANGELOG.md b/service/migrationhubrefactorspaces/CHANGELOG.md
index f09df1d2bc3..b4a38ce837c 100644
--- a/service/migrationhubrefactorspaces/CHANGELOG.md
+++ b/service/migrationhubrefactorspaces/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/migrationhubrefactorspaces/go.mod b/service/migrationhubrefactorspaces/go.mod
index e30d6acd2fa..19ddc3486e7 100644
--- a/service/migrationhubrefactorspaces/go.mod
+++ b/service/migrationhubrefactorspaces/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhubrefactorspaces
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/migrationhubrefactorspaces/go_module_metadata.go b/service/migrationhubrefactorspaces/go_module_metadata.go
index 58a98b03033..85edfef35c7 100644
--- a/service/migrationhubrefactorspaces/go_module_metadata.go
+++ b/service/migrationhubrefactorspaces/go_module_metadata.go
@@ -3,4 +3,4 @@
 package migrationhubrefactorspaces
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.13"
+const goModuleVersion = "1.20.14"
diff --git a/service/migrationhubstrategy/CHANGELOG.md b/service/migrationhubstrategy/CHANGELOG.md
index ae9ec826793..59ae4bad574 100644
--- a/service/migrationhubstrategy/CHANGELOG.md
+++ b/service/migrationhubstrategy/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/migrationhubstrategy/go.mod b/service/migrationhubstrategy/go.mod
index de464d15678..712cf0c3061 100644
--- a/service/migrationhubstrategy/go.mod
+++ b/service/migrationhubstrategy/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/migrationhubstrategy
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/migrationhubstrategy/go_module_metadata.go b/service/migrationhubstrategy/go_module_metadata.go
index 6f5561bf06c..35dc7b39e49 100644
--- a/service/migrationhubstrategy/go_module_metadata.go
+++ b/service/migrationhubstrategy/go_module_metadata.go
@@ -3,4 +3,4 @@
 package migrationhubstrategy
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.13"
+const goModuleVersion = "1.21.14"
diff --git a/service/mq/CHANGELOG.md b/service/mq/CHANGELOG.md
index 245c768b0a5..9c66cf59c92 100644
--- a/service/mq/CHANGELOG.md
+++ b/service/mq/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mq/go.mod b/service/mq/go.mod
index 5be8722a834..bcdb02538e1 100644
--- a/service/mq/go.mod
+++ b/service/mq/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mq
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mq/go_module_metadata.go b/service/mq/go_module_metadata.go
index 7200c2c0a74..fe8e72c05d9 100644
--- a/service/mq/go_module_metadata.go
+++ b/service/mq/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mq
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.14"
+const goModuleVersion = "1.27.15"
diff --git a/service/mturk/CHANGELOG.md b/service/mturk/CHANGELOG.md
index bc236fd11db..d30bf8e0f70 100644
--- a/service/mturk/CHANGELOG.md
+++ b/service/mturk/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mturk/go.mod b/service/mturk/go.mod
index 57a3a979a12..ced64dbaab6 100644
--- a/service/mturk/go.mod
+++ b/service/mturk/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mturk
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mturk/go_module_metadata.go b/service/mturk/go_module_metadata.go
index 632194408d3..a1db7b91c55 100644
--- a/service/mturk/go_module_metadata.go
+++ b/service/mturk/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mturk
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/mwaa/CHANGELOG.md b/service/mwaa/CHANGELOG.md
index 605721e9428..9a886b32f44 100644
--- a/service/mwaa/CHANGELOG.md
+++ b/service/mwaa/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/mwaa/go.mod b/service/mwaa/go.mod
index 5f6b63eaafb..71c4f26e888 100644
--- a/service/mwaa/go.mod
+++ b/service/mwaa/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/mwaa
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/mwaa/go_module_metadata.go b/service/mwaa/go_module_metadata.go
index e3f2b6f7182..8d049ba2882 100644
--- a/service/mwaa/go_module_metadata.go
+++ b/service/mwaa/go_module_metadata.go
@@ -3,4 +3,4 @@
 package mwaa
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.8"
+const goModuleVersion = "1.33.9"
diff --git a/service/neptune/CHANGELOG.md b/service/neptune/CHANGELOG.md
index 2d587536abd..a50e44e9c82 100644
--- a/service/neptune/CHANGELOG.md
+++ b/service/neptune/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.35.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.35.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/neptune/api_op_DescribeDBInstances.go b/service/neptune/api_op_DescribeDBInstances.go
index 89071a8ad0f..d97f1bd2315 100644
--- a/service/neptune/api_op_DescribeDBInstances.go
+++ b/service/neptune/api_op_DescribeDBInstances.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,29 +356,20 @@ func (w *DBInstanceAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -389,122 +379,117 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -674,29 +659,20 @@ func (w *DBInstanceDeletedWaiter) WaitForOutput(ctx context.Context, params *Des
 func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -718,98 +694,94 @@ func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInsta
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/neptune/generated.json b/service/neptune/generated.json
index a7f3f804a46..b44e7d928a6 100644
--- a/service/neptune/generated.json
+++ b/service/neptune/generated.json
@@ -5,8 +5,7 @@
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5",
         "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/neptune/go.mod b/service/neptune/go.mod
index ef20315714b..b464c40f942 100644
--- a/service/neptune/go.mod
+++ b/service/neptune/go.mod
@@ -3,13 +3,12 @@ module github.com/aws/aws-sdk-go-v2/service/neptune
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/neptune/go.sum b/service/neptune/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/neptune/go.sum
+++ b/service/neptune/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/neptune/go_module_metadata.go b/service/neptune/go_module_metadata.go
index 12d0cdd0fdf..bc71b727e6a 100644
--- a/service/neptune/go_module_metadata.go
+++ b/service/neptune/go_module_metadata.go
@@ -3,4 +3,4 @@
 package neptune
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.35.14"
+const goModuleVersion = "1.35.15"
diff --git a/service/neptunedata/CHANGELOG.md b/service/neptunedata/CHANGELOG.md
index 2abb9ea1721..e4eb686c67c 100644
--- a/service/neptunedata/CHANGELOG.md
+++ b/service/neptunedata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.9.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.9.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/neptunedata/go.mod b/service/neptunedata/go.mod
index 683828ceb8a..1091e271b9c 100644
--- a/service/neptunedata/go.mod
+++ b/service/neptunedata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/neptunedata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/neptunedata/go_module_metadata.go b/service/neptunedata/go_module_metadata.go
index ca88b399e12..386b30cddd4 100644
--- a/service/neptunedata/go_module_metadata.go
+++ b/service/neptunedata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package neptunedata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.9.12"
+const goModuleVersion = "1.9.13"
diff --git a/service/neptunegraph/CHANGELOG.md b/service/neptunegraph/CHANGELOG.md
index edaa0099ca6..a077fd5b118 100644
--- a/service/neptunegraph/CHANGELOG.md
+++ b/service/neptunegraph/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.15.9 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.15.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/neptunegraph/api_op_GetExportTask.go b/service/neptunegraph/api_op_GetExportTask.go
index bd5fcca0d72..13e32c7ec9c 100644
--- a/service/neptunegraph/api_op_GetExportTask.go
+++ b/service/neptunegraph/api_op_GetExportTask.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -365,69 +364,41 @@ func (w *ExportTaskSuccessfulWaiter) WaitForOutput(ctx context.Context, params *
 func exportTaskSuccessfulStateRetryable(ctx context.Context, input *GetExportTaskInput, output *GetExportTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ExportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ExportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ExportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.ExportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -600,39 +571,29 @@ func (w *ExportTaskCancelledWaiter) WaitForOutput(ctx context.Context, params *G
 func exportTaskCancelledStateRetryable(ctx context.Context, input *GetExportTaskInput, output *GetExportTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status != 'CANCELLING' && status != 'CANCELLED'", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
+		v2 := "CANCELLING"
+		v3 := string(v1) != string(v2)
+		v4 := output.Status
+		v5 := "CANCELLED"
+		v6 := string(v4) != string(v5)
+		v7 := v3 && v6
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v7 == bv {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ExportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ExportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/neptunegraph/api_op_GetGraph.go b/service/neptunegraph/api_op_GetGraph.go
index eb309285646..b286627543b 100644
--- a/service/neptunegraph/api_op_GetGraph.go
+++ b/service/neptunegraph/api_op_GetGraph.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -371,52 +370,31 @@ func (w *GraphAvailableWaiter) WaitForOutput(ctx context.Context, params *GetGra
 func graphAvailableStateRetryable(ctx context.Context, input *GetGraphInput, output *GetGraphOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.GraphStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.GraphStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.GraphStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.GraphStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "AVAILABLE"
-		value, ok := pathValue.(types.GraphStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.GraphStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -586,22 +564,15 @@ func (w *GraphDeletedWaiter) WaitForOutput(ctx context.Context, params *GetGraph
 func graphDeletedStateRetryable(ctx context.Context, input *GetGraphInput, output *GetGraphOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status != 'DELETING'", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
+		v2 := "DELETING"
+		v3 := string(v1) != string(v2)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v3 == bv {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/neptunegraph/api_op_GetGraphSnapshot.go b/service/neptunegraph/api_op_GetGraphSnapshot.go
index 2713d94181b..e9f2dbaecc3 100644
--- a/service/neptunegraph/api_op_GetGraphSnapshot.go
+++ b/service/neptunegraph/api_op_GetGraphSnapshot.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -350,52 +349,31 @@ func (w *GraphSnapshotAvailableWaiter) WaitForOutput(ctx context.Context, params
 func graphSnapshotAvailableStateRetryable(ctx context.Context, input *GetGraphSnapshotInput, output *GetGraphSnapshotOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.SnapshotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SnapshotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.SnapshotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SnapshotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "AVAILABLE"
-		value, ok := pathValue.(types.SnapshotStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SnapshotStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -568,22 +546,15 @@ func (w *GraphSnapshotDeletedWaiter) WaitForOutput(ctx context.Context, params *
 func graphSnapshotDeletedStateRetryable(ctx context.Context, input *GetGraphSnapshotInput, output *GetGraphSnapshotOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status != 'DELETING'", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
+		v2 := "DELETING"
+		v3 := string(v1) != string(v2)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v3 == bv {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/neptunegraph/api_op_GetImportTask.go b/service/neptunegraph/api_op_GetImportTask.go
index c3db8cbf9dc..62f473271fc 100644
--- a/service/neptunegraph/api_op_GetImportTask.go
+++ b/service/neptunegraph/api_op_GetImportTask.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -395,86 +394,51 @@ func (w *ImportTaskSuccessfulWaiter) WaitForOutput(ctx context.Context, params *
 func importTaskSuccessfulStateRetryable(ctx context.Context, input *GetImportTaskInput, output *GetImportTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ROLLING_BACK"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -647,39 +611,29 @@ func (w *ImportTaskCancelledWaiter) WaitForOutput(ctx context.Context, params *G
 func importTaskCancelledStateRetryable(ctx context.Context, input *GetImportTaskInput, output *GetImportTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status != 'CANCELLING' && status != 'CANCELLED'", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
+		v2 := "CANCELLING"
+		v3 := string(v1) != string(v2)
+		v4 := output.Status
+		v5 := "CANCELLED"
+		v6 := string(v4) != string(v5)
+		v7 := v3 && v6
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v7 == bv {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ImportTaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImportTaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/neptunegraph/api_op_GetPrivateGraphEndpoint.go b/service/neptunegraph/api_op_GetPrivateGraphEndpoint.go
index 9b3c9772ef1..42deb0cf8f1 100644
--- a/service/neptunegraph/api_op_GetPrivateGraphEndpoint.go
+++ b/service/neptunegraph/api_op_GetPrivateGraphEndpoint.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -345,52 +344,31 @@ func (w *PrivateGraphEndpointAvailableWaiter) WaitForOutput(ctx context.Context,
 func privateGraphEndpointAvailableStateRetryable(ctx context.Context, input *GetPrivateGraphEndpointInput, output *GetPrivateGraphEndpointOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.PrivateGraphEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.PrivateGraphEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.PrivateGraphEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.PrivateGraphEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "AVAILABLE"
-		value, ok := pathValue.(types.PrivateGraphEndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.PrivateGraphEndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -565,22 +543,15 @@ func (w *PrivateGraphEndpointDeletedWaiter) WaitForOutput(ctx context.Context, p
 func privateGraphEndpointDeletedStateRetryable(ctx context.Context, input *GetPrivateGraphEndpointInput, output *GetPrivateGraphEndpointOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status != 'DELETING'", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
+		v2 := "DELETING"
+		v3 := string(v1) != string(v2)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v3 == bv {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/neptunegraph/generated.json b/service/neptunegraph/generated.json
index a01dd7bed0b..7521571c18b 100644
--- a/service/neptunegraph/generated.json
+++ b/service/neptunegraph/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/neptunegraph/go.mod b/service/neptunegraph/go.mod
index 1371eee65de..e42c19f6e85 100644
--- a/service/neptunegraph/go.mod
+++ b/service/neptunegraph/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/neptunegraph
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/neptunegraph/go.sum b/service/neptunegraph/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/neptunegraph/go.sum
+++ b/service/neptunegraph/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/neptunegraph/go_module_metadata.go b/service/neptunegraph/go_module_metadata.go
index 7c6b3ace637..10f4fd43740 100644
--- a/service/neptunegraph/go_module_metadata.go
+++ b/service/neptunegraph/go_module_metadata.go
@@ -3,4 +3,4 @@
 package neptunegraph
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.15.8"
+const goModuleVersion = "1.15.9"
diff --git a/service/networkfirewall/CHANGELOG.md b/service/networkfirewall/CHANGELOG.md
index 93fca560e59..0b42585fe22 100644
--- a/service/networkfirewall/CHANGELOG.md
+++ b/service/networkfirewall/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.44.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.44.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/networkfirewall/go.mod b/service/networkfirewall/go.mod
index 91f2b31a33d..02aa7d68ec0 100644
--- a/service/networkfirewall/go.mod
+++ b/service/networkfirewall/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/networkfirewall
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/networkfirewall/go_module_metadata.go b/service/networkfirewall/go_module_metadata.go
index 75994c225d7..3efd383c1c7 100644
--- a/service/networkfirewall/go_module_metadata.go
+++ b/service/networkfirewall/go_module_metadata.go
@@ -3,4 +3,4 @@
 package networkfirewall
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.44.12"
+const goModuleVersion = "1.44.13"
diff --git a/service/networkflowmonitor/CHANGELOG.md b/service/networkflowmonitor/CHANGELOG.md
index fa4f0899dad..53ba4ea41c3 100644
--- a/service/networkflowmonitor/CHANGELOG.md
+++ b/service/networkflowmonitor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/networkflowmonitor/go.mod b/service/networkflowmonitor/go.mod
index 9a4a6b99bf7..b9c5916a7dc 100644
--- a/service/networkflowmonitor/go.mod
+++ b/service/networkflowmonitor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/networkflowmonitor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/networkflowmonitor/go_module_metadata.go b/service/networkflowmonitor/go_module_metadata.go
index 1eb091fe03b..399e8610104 100644
--- a/service/networkflowmonitor/go_module_metadata.go
+++ b/service/networkflowmonitor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package networkflowmonitor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.6"
+const goModuleVersion = "1.0.7"
diff --git a/service/networkmanager/CHANGELOG.md b/service/networkmanager/CHANGELOG.md
index 5c2c421ecd7..1e20451ce36 100644
--- a/service/networkmanager/CHANGELOG.md
+++ b/service/networkmanager/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/networkmanager/go.mod b/service/networkmanager/go.mod
index 23a441c55c4..38521ad4a93 100644
--- a/service/networkmanager/go.mod
+++ b/service/networkmanager/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/networkmanager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/networkmanager/go_module_metadata.go b/service/networkmanager/go_module_metadata.go
index 655f039091a..3e70b2bbc62 100644
--- a/service/networkmanager/go_module_metadata.go
+++ b/service/networkmanager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package networkmanager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.8"
+const goModuleVersion = "1.32.9"
diff --git a/service/networkmonitor/CHANGELOG.md b/service/networkmonitor/CHANGELOG.md
index 3d7583b3c48..dae0a39e16d 100644
--- a/service/networkmonitor/CHANGELOG.md
+++ b/service/networkmonitor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/networkmonitor/go.mod b/service/networkmonitor/go.mod
index d51d9559609..1f765732f6a 100644
--- a/service/networkmonitor/go.mod
+++ b/service/networkmonitor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/networkmonitor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/networkmonitor/go_module_metadata.go b/service/networkmonitor/go_module_metadata.go
index 199cd67d3dc..8b24ec08d1d 100644
--- a/service/networkmonitor/go_module_metadata.go
+++ b/service/networkmonitor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package networkmonitor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.13"
+const goModuleVersion = "1.7.14"
diff --git a/service/notifications/CHANGELOG.md b/service/notifications/CHANGELOG.md
index d64f07a2ce4..390c130b1d8 100644
--- a/service/notifications/CHANGELOG.md
+++ b/service/notifications/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.3 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/notifications/go.mod b/service/notifications/go.mod
index 24b0cc375fa..e228eb974de 100644
--- a/service/notifications/go.mod
+++ b/service/notifications/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/notifications
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/notifications/go_module_metadata.go b/service/notifications/go_module_metadata.go
index b3f162c4acf..01ba2fd188a 100644
--- a/service/notifications/go_module_metadata.go
+++ b/service/notifications/go_module_metadata.go
@@ -3,4 +3,4 @@
 package notifications
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.2"
+const goModuleVersion = "1.1.3"
diff --git a/service/notificationscontacts/CHANGELOG.md b/service/notificationscontacts/CHANGELOG.md
index c731afb8690..b29cbd453f3 100644
--- a/service/notificationscontacts/CHANGELOG.md
+++ b/service/notificationscontacts/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/notificationscontacts/go.mod b/service/notificationscontacts/go.mod
index 05e9d2a7e42..74543e463ca 100644
--- a/service/notificationscontacts/go.mod
+++ b/service/notificationscontacts/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/notificationscontacts
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/notificationscontacts/go_module_metadata.go b/service/notificationscontacts/go_module_metadata.go
index ae773c39cae..75e03d8534c 100644
--- a/service/notificationscontacts/go_module_metadata.go
+++ b/service/notificationscontacts/go_module_metadata.go
@@ -3,4 +3,4 @@
 package notificationscontacts
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.7"
+const goModuleVersion = "1.0.8"
diff --git a/service/oam/CHANGELOG.md b/service/oam/CHANGELOG.md
index 672bb39b5bd..4662ae43613 100644
--- a/service/oam/CHANGELOG.md
+++ b/service/oam/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.15.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.15.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/oam/go.mod b/service/oam/go.mod
index f668db0ffc9..cade7eafc90 100644
--- a/service/oam/go.mod
+++ b/service/oam/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/oam
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/oam/go_module_metadata.go b/service/oam/go_module_metadata.go
index 6cab41e9580..d9f417e2e1f 100644
--- a/service/oam/go_module_metadata.go
+++ b/service/oam/go_module_metadata.go
@@ -3,4 +3,4 @@
 package oam
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.15.15"
+const goModuleVersion = "1.15.16"
diff --git a/service/observabilityadmin/CHANGELOG.md b/service/observabilityadmin/CHANGELOG.md
index f0d519dc461..689b96017dd 100644
--- a/service/observabilityadmin/CHANGELOG.md
+++ b/service/observabilityadmin/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.0.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.0.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/observabilityadmin/go.mod b/service/observabilityadmin/go.mod
index baa0d16dab5..1502a6c2d98 100644
--- a/service/observabilityadmin/go.mod
+++ b/service/observabilityadmin/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/observabilityadmin
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/observabilityadmin/go_module_metadata.go b/service/observabilityadmin/go_module_metadata.go
index 7203af7fef7..2dae02c5f2d 100644
--- a/service/observabilityadmin/go_module_metadata.go
+++ b/service/observabilityadmin/go_module_metadata.go
@@ -3,4 +3,4 @@
 package observabilityadmin
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.0.7"
+const goModuleVersion = "1.0.8"
diff --git a/service/omics/CHANGELOG.md b/service/omics/CHANGELOG.md
index 986358f92d3..56e4a11e356 100644
--- a/service/omics/CHANGELOG.md
+++ b/service/omics/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.28.9 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/omics/api_op_GetAnnotationImportJob.go b/service/omics/api_op_GetAnnotationImportJob.go
index 9f5585484b8..468c106a20f 100644
--- a/service/omics/api_op_GetAnnotationImportJob.go
+++ b/service/omics/api_op_GetAnnotationImportJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -379,86 +378,51 @@ func (w *AnnotationImportJobCreatedWaiter) WaitForOutput(ctx context.Context, pa
 func annotationImportJobCreatedStateRetryable(ctx context.Context, input *GetAnnotationImportJobInput, output *GetAnnotationImportJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/omics/api_op_GetAnnotationStore.go b/service/omics/api_op_GetAnnotationStore.go
index aa6253bd33a..7dcce1e4301 100644
--- a/service/omics/api_op_GetAnnotationStore.go
+++ b/service/omics/api_op_GetAnnotationStore.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -386,69 +385,41 @@ func (w *AnnotationStoreCreatedWaiter) WaitForOutput(ctx context.Context, params
 func annotationStoreCreatedStateRetryable(ctx context.Context, input *GetAnnotationStoreInput, output *GetAnnotationStoreOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -621,18 +592,11 @@ func (w *AnnotationStoreDeletedWaiter) WaitForOutput(ctx context.Context, params
 func annotationStoreDeletedStateRetryable(ctx context.Context, input *GetAnnotationStoreInput, output *GetAnnotationStoreOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -645,18 +609,11 @@ func annotationStoreDeletedStateRetryable(ctx context.Context, input *GetAnnotat
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/omics/api_op_GetAnnotationStoreVersion.go b/service/omics/api_op_GetAnnotationStoreVersion.go
index 4e287f3ad37..b58e82835fc 100644
--- a/service/omics/api_op_GetAnnotationStoreVersion.go
+++ b/service/omics/api_op_GetAnnotationStoreVersion.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -386,69 +385,41 @@ func (w *AnnotationStoreVersionCreatedWaiter) WaitForOutput(ctx context.Context,
 func annotationStoreVersionCreatedStateRetryable(ctx context.Context, input *GetAnnotationStoreVersionInput, output *GetAnnotationStoreVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -624,18 +595,11 @@ func (w *AnnotationStoreVersionDeletedWaiter) WaitForOutput(ctx context.Context,
 func annotationStoreVersionDeletedStateRetryable(ctx context.Context, input *GetAnnotationStoreVersionInput, output *GetAnnotationStoreVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -648,18 +612,11 @@ func annotationStoreVersionDeletedStateRetryable(ctx context.Context, input *Get
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.VersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.VersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/omics/api_op_GetReadSetActivationJob.go b/service/omics/api_op_GetReadSetActivationJob.go
index a3633ac432f..197ff9b89e8 100644
--- a/service/omics/api_op_GetReadSetActivationJob.go
+++ b/service/omics/api_op_GetReadSetActivationJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -351,120 +350,71 @@ func (w *ReadSetActivationJobCompletedWaiter) WaitForOutput(ctx context.Context,
 func readSetActivationJobCompletedStateRetryable(ctx context.Context, input *GetReadSetActivationJobInput, output *GetReadSetActivationJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED_WITH_FAILURES"
-		value, ok := pathValue.(types.ReadSetActivationJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetActivationJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetReadSetExportJob.go b/service/omics/api_op_GetReadSetExportJob.go
index 68d48f37cdd..d541d03f5cd 100644
--- a/service/omics/api_op_GetReadSetExportJob.go
+++ b/service/omics/api_op_GetReadSetExportJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -354,120 +353,71 @@ func (w *ReadSetExportJobCompletedWaiter) WaitForOutput(ctx context.Context, par
 func readSetExportJobCompletedStateRetryable(ctx context.Context, input *GetReadSetExportJobInput, output *GetReadSetExportJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED_WITH_FAILURES"
-		value, ok := pathValue.(types.ReadSetExportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetExportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetReadSetImportJob.go b/service/omics/api_op_GetReadSetImportJob.go
index 2d23f8b9d34..be13925cb59 100644
--- a/service/omics/api_op_GetReadSetImportJob.go
+++ b/service/omics/api_op_GetReadSetImportJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -356,120 +355,71 @@ func (w *ReadSetImportJobCompletedWaiter) WaitForOutput(ctx context.Context, par
 func readSetImportJobCompletedStateRetryable(ctx context.Context, input *GetReadSetImportJobInput, output *GetReadSetImportJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED_WITH_FAILURES"
-		value, ok := pathValue.(types.ReadSetImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReadSetImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetReferenceImportJob.go b/service/omics/api_op_GetReferenceImportJob.go
index 9b3fce22922..5177180acf8 100644
--- a/service/omics/api_op_GetReferenceImportJob.go
+++ b/service/omics/api_op_GetReferenceImportJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -357,120 +356,71 @@ func (w *ReferenceImportJobCompletedWaiter) WaitForOutput(ctx context.Context, p
 func referenceImportJobCompletedStateRetryable(ctx context.Context, input *GetReferenceImportJobInput, output *GetReferenceImportJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLING"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED_WITH_FAILURES"
-		value, ok := pathValue.(types.ReferenceImportJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReferenceImportJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetRun.go b/service/omics/api_op_GetRun.go
index 808785a0fbb..ad366cb4975 100644
--- a/service/omics/api_op_GetRun.go
+++ b/service/omics/api_op_GetRun.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -427,86 +426,51 @@ func (w *RunRunningWaiter) WaitForOutput(ctx context.Context, params *GetRunInpu
 func runRunningStateRetryable(ctx context.Context, input *GetRunInput, output *GetRunOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -676,103 +640,61 @@ func (w *RunCompletedWaiter) WaitForOutput(ctx context.Context, params *GetRunIn
 func runCompletedStateRetryable(ctx context.Context, input *GetRunInput, output *GetRunOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STOPPING"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.RunStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.RunStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetRunTask.go b/service/omics/api_op_GetRunTask.go
index dc64797f6e1..dd8126b6fb0 100644
--- a/service/omics/api_op_GetRunTask.go
+++ b/service/omics/api_op_GetRunTask.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -362,86 +361,51 @@ func (w *TaskRunningWaiter) WaitForOutput(ctx context.Context, params *GetRunTas
 func taskRunningStateRetryable(ctx context.Context, input *GetRunTaskInput, output *GetRunTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -612,103 +576,61 @@ func (w *TaskCompletedWaiter) WaitForOutput(ctx context.Context, params *GetRunT
 func taskCompletedStateRetryable(ctx context.Context, input *GetRunTaskInput, output *GetRunTaskOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STARTING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "RUNNING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "STOPPING"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.TaskStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TaskStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/api_op_GetVariantImportJob.go b/service/omics/api_op_GetVariantImportJob.go
index d68c8be636e..cd34d592f10 100644
--- a/service/omics/api_op_GetVariantImportJob.go
+++ b/service/omics/api_op_GetVariantImportJob.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -365,86 +364,51 @@ func (w *VariantImportJobCreatedWaiter) WaitForOutput(ctx context.Context, param
 func variantImportJobCreatedStateRetryable(ctx context.Context, input *GetVariantImportJobInput, output *GetVariantImportJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "SUBMITTED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "IN_PROGRESS"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CANCELLED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "COMPLETED"
-		value, ok := pathValue.(types.JobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.JobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/omics/api_op_GetVariantStore.go b/service/omics/api_op_GetVariantStore.go
index ae0e8118c65..a59678c8db4 100644
--- a/service/omics/api_op_GetVariantStore.go
+++ b/service/omics/api_op_GetVariantStore.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -375,69 +374,41 @@ func (w *VariantStoreCreatedWaiter) WaitForOutput(ctx context.Context, params *G
 func variantStoreCreatedStateRetryable(ctx context.Context, input *GetVariantStoreInput, output *GetVariantStoreOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -610,18 +581,11 @@ func (w *VariantStoreDeletedWaiter) WaitForOutput(ctx context.Context, params *G
 func variantStoreDeletedStateRetryable(ctx context.Context, input *GetVariantStoreInput, output *GetVariantStoreOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETED"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
@@ -634,18 +598,11 @@ func variantStoreDeletedStateRetryable(ctx context.Context, input *GetVariantSto
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.StoreStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.StoreStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/omics/api_op_GetWorkflow.go b/service/omics/api_op_GetWorkflow.go
index 3ce87081504..dd402344e6b 100644
--- a/service/omics/api_op_GetWorkflow.go
+++ b/service/omics/api_op_GetWorkflow.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -374,69 +373,41 @@ func (w *WorkflowActiveWaiter) WaitForOutput(ctx context.Context, params *GetWor
 func workflowActiveStateRetryable(ctx context.Context, input *GetWorkflowInput, output *GetWorkflowOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.WorkflowStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkflowStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.WorkflowStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkflowStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.WorkflowStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkflowStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.WorkflowStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.WorkflowStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/omics/generated.json b/service/omics/generated.json
index ea21a559ee6..b34d7c6269f 100644
--- a/service/omics/generated.json
+++ b/service/omics/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/omics/go.mod b/service/omics/go.mod
index 1060405a67f..45b52a71a7c 100644
--- a/service/omics/go.mod
+++ b/service/omics/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/omics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/omics/go.sum b/service/omics/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/omics/go.sum
+++ b/service/omics/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/omics/go_module_metadata.go b/service/omics/go_module_metadata.go
index 7282f5ae2da..87663cdcfcc 100644
--- a/service/omics/go_module_metadata.go
+++ b/service/omics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package omics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.8"
+const goModuleVersion = "1.28.9"
diff --git a/service/opensearch/CHANGELOG.md b/service/opensearch/CHANGELOG.md
index 25f51e176f6..fb21832fd10 100644
--- a/service/opensearch/CHANGELOG.md
+++ b/service/opensearch/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/opensearch/go.mod b/service/opensearch/go.mod
index d20875c9800..dfab47d7b8e 100644
--- a/service/opensearch/go.mod
+++ b/service/opensearch/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/opensearch
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/opensearch/go_module_metadata.go b/service/opensearch/go_module_metadata.go
index 08f580994a4..a4a336ced6e 100644
--- a/service/opensearch/go_module_metadata.go
+++ b/service/opensearch/go_module_metadata.go
@@ -3,4 +3,4 @@
 package opensearch
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.8"
+const goModuleVersion = "1.45.9"
diff --git a/service/opensearchserverless/CHANGELOG.md b/service/opensearchserverless/CHANGELOG.md
index b2755fcaeb8..cb259e95d92 100644
--- a/service/opensearchserverless/CHANGELOG.md
+++ b/service/opensearchserverless/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.17.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.17.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/opensearchserverless/go.mod b/service/opensearchserverless/go.mod
index 61714b60065..8258a5f449a 100644
--- a/service/opensearchserverless/go.mod
+++ b/service/opensearchserverless/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/opensearchserverless
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/opensearchserverless/go_module_metadata.go b/service/opensearchserverless/go_module_metadata.go
index 9117b2d9e11..330f7883506 100644
--- a/service/opensearchserverless/go_module_metadata.go
+++ b/service/opensearchserverless/go_module_metadata.go
@@ -3,4 +3,4 @@
 package opensearchserverless
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.17.11"
+const goModuleVersion = "1.17.12"
diff --git a/service/opsworks/CHANGELOG.md b/service/opsworks/CHANGELOG.md
index da73582a426..04d933b0729 100644
--- a/service/opsworks/CHANGELOG.md
+++ b/service/opsworks/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.26.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/opsworks/api_op_DescribeDeployments.go b/service/opsworks/api_op_DescribeDeployments.go
index 418974c9a41..de50415cb70 100644
--- a/service/opsworks/api_op_DescribeDeployments.go
+++ b/service/opsworks/api_op_DescribeDeployments.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -328,29 +327,20 @@ func (w *DeploymentSuccessfulWaiter) WaitForOutput(ctx context.Context, params *
 func deploymentSuccessfulStateRetryable(ctx context.Context, input *DescribeDeploymentsInput, output *DescribeDeploymentsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Deployments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Deployments
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "successful"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -360,26 +350,25 @@ func deploymentSuccessfulStateRetryable(ctx context.Context, input *DescribeDepl
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Deployments[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Deployments
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/opsworks/api_op_DescribeInstances.go b/service/opsworks/api_op_DescribeInstances.go
index 72137a54536..d28852fa5f3 100644
--- a/service/opsworks/api_op_DescribeInstances.go
+++ b/service/opsworks/api_op_DescribeInstances.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -327,29 +326,20 @@ func (w *InstanceOnlineWaiter) WaitForOutput(ctx context.Context, params *Descri
 func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesInput, output *DescribeInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "online"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -359,194 +349,186 @@ func instanceOnlineStateRetryable(ctx context.Context, input *DescribeInstancesI
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "setup_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "shutting_down"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "start_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopping"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "terminating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "terminated"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stop_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -716,29 +698,20 @@ func (w *InstanceRegisteredWaiter) WaitForOutput(ctx context.Context, params *De
 func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstancesInput, output *DescribeInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "registered"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -748,170 +721,163 @@ func instanceRegisteredStateRetryable(ctx context.Context, input *DescribeInstan
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "setup_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "shutting_down"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopping"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "terminating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "terminated"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stop_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1081,29 +1047,20 @@ func (w *InstanceStoppedWaiter) WaitForOutput(ctx context.Context, params *Descr
 func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstancesInput, output *DescribeInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stopped"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1113,194 +1070,186 @@ func instanceStoppedStateRetryable(ctx context.Context, input *DescribeInstances
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "booting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "pending"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "requested"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "running_setup"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "setup_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "start_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "stop_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -1470,29 +1419,20 @@ func (w *InstanceTerminatedWaiter) WaitForOutput(ctx context.Context, params *De
 func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstancesInput, output *DescribeInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "terminated"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -1509,194 +1449,186 @@ func instanceTerminatedStateRetryable(ctx context.Context, input *DescribeInstan
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "booting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "online"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "pending"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "requested"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "running_setup"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "setup_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Instances[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Instances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "start_failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/opsworks/generated.json b/service/opsworks/generated.json
index 3792ad14f5a..132b060d677 100644
--- a/service/opsworks/generated.json
+++ b/service/opsworks/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/opsworks/go.mod b/service/opsworks/go.mod
index 1e1b1d56d40..c551c88c7fe 100644
--- a/service/opsworks/go.mod
+++ b/service/opsworks/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/opsworks
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/opsworks/go.sum b/service/opsworks/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/opsworks/go.sum
+++ b/service/opsworks/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/opsworks/go_module_metadata.go b/service/opsworks/go_module_metadata.go
index 6e4c4a55bda..ec915124c83 100644
--- a/service/opsworks/go_module_metadata.go
+++ b/service/opsworks/go_module_metadata.go
@@ -3,4 +3,4 @@
 package opsworks
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.14"
+const goModuleVersion = "1.26.15"
diff --git a/service/opsworkscm/CHANGELOG.md b/service/opsworkscm/CHANGELOG.md
index 9856c19073a..53443faa7fd 100644
--- a/service/opsworkscm/CHANGELOG.md
+++ b/service/opsworkscm/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.27.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go
index 26aea786d69..b8ff36ccdee 100644
--- a/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go
+++ b/service/opsworkscm/api_op_DescribeNodeAssociationStatus.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -337,35 +336,21 @@ func (w *NodeAssociatedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func nodeAssociatedStateRetryable(ctx context.Context, input *DescribeNodeAssociationStatusInput, output *DescribeNodeAssociationStatusOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NodeAssociationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NodeAssociationStatus
 		expectedValue := "SUCCESS"
-		value, ok := pathValue.(types.NodeAssociationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeAssociationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NodeAssociationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NodeAssociationStatus
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.NodeAssociationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NodeAssociationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/opsworkscm/generated.json b/service/opsworkscm/generated.json
index 72b569e5c74..b76fd3908f1 100644
--- a/service/opsworkscm/generated.json
+++ b/service/opsworkscm/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/opsworkscm/go.mod b/service/opsworkscm/go.mod
index 83629460424..f843ee6dffd 100644
--- a/service/opsworkscm/go.mod
+++ b/service/opsworkscm/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/opsworkscm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/opsworkscm/go.sum b/service/opsworkscm/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/opsworkscm/go.sum
+++ b/service/opsworkscm/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/opsworkscm/go_module_metadata.go b/service/opsworkscm/go_module_metadata.go
index 8bf3fbcfc7c..83b517b5e6f 100644
--- a/service/opsworkscm/go_module_metadata.go
+++ b/service/opsworkscm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package opsworkscm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.15"
+const goModuleVersion = "1.27.16"
diff --git a/service/organizations/CHANGELOG.md b/service/organizations/CHANGELOG.md
index 2f0580bd5a1..c4e60a56169 100644
--- a/service/organizations/CHANGELOG.md
+++ b/service/organizations/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.37.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/organizations/go.mod b/service/organizations/go.mod
index 78fe2484024..e1b0e7f9168 100644
--- a/service/organizations/go.mod
+++ b/service/organizations/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/organizations
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/organizations/go_module_metadata.go b/service/organizations/go_module_metadata.go
index bcee2011b91..9d1eed84ef0 100644
--- a/service/organizations/go_module_metadata.go
+++ b/service/organizations/go_module_metadata.go
@@ -3,4 +3,4 @@
 package organizations
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.5"
+const goModuleVersion = "1.37.6"
diff --git a/service/osis/CHANGELOG.md b/service/osis/CHANGELOG.md
index 043718a1d12..979fc0a21f7 100644
--- a/service/osis/CHANGELOG.md
+++ b/service/osis/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/osis/go.mod b/service/osis/go.mod
index 698e5933499..45f8aa242a1 100644
--- a/service/osis/go.mod
+++ b/service/osis/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/osis
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/osis/go_module_metadata.go b/service/osis/go_module_metadata.go
index 09f020bf75f..9aefbdac1d8 100644
--- a/service/osis/go_module_metadata.go
+++ b/service/osis/go_module_metadata.go
@@ -3,4 +3,4 @@
 package osis
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.13"
+const goModuleVersion = "1.14.14"
diff --git a/service/outposts/CHANGELOG.md b/service/outposts/CHANGELOG.md
index 8decb134438..e2d2943ca5e 100644
--- a/service/outposts/CHANGELOG.md
+++ b/service/outposts/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.48.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.48.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/outposts/go.mod b/service/outposts/go.mod
index cad041329c3..13d03a85477 100644
--- a/service/outposts/go.mod
+++ b/service/outposts/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/outposts
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/outposts/go_module_metadata.go b/service/outposts/go_module_metadata.go
index a45b6adf356..b7451380ad4 100644
--- a/service/outposts/go_module_metadata.go
+++ b/service/outposts/go_module_metadata.go
@@ -3,4 +3,4 @@
 package outposts
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.48.5"
+const goModuleVersion = "1.48.6"
diff --git a/service/panorama/CHANGELOG.md b/service/panorama/CHANGELOG.md
index 99d082bda70..21627d233e0 100644
--- a/service/panorama/CHANGELOG.md
+++ b/service/panorama/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.22.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.22.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/panorama/go.mod b/service/panorama/go.mod
index 2111803e4e7..e8d1e673d90 100644
--- a/service/panorama/go.mod
+++ b/service/panorama/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/panorama
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/panorama/go_module_metadata.go b/service/panorama/go_module_metadata.go
index 866c742d571..849a4c8824f 100644
--- a/service/panorama/go_module_metadata.go
+++ b/service/panorama/go_module_metadata.go
@@ -3,4 +3,4 @@
 package panorama
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.22.13"
+const goModuleVersion = "1.22.14"
diff --git a/service/partnercentralselling/CHANGELOG.md b/service/partnercentralselling/CHANGELOG.md
index bd9a8c6e41d..9070d7aa874 100644
--- a/service/partnercentralselling/CHANGELOG.md
+++ b/service/partnercentralselling/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.3.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.3.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/partnercentralselling/go.mod b/service/partnercentralselling/go.mod
index 34568766cda..db87b8e2332 100644
--- a/service/partnercentralselling/go.mod
+++ b/service/partnercentralselling/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/partnercentralselling
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/partnercentralselling/go_module_metadata.go b/service/partnercentralselling/go_module_metadata.go
index 516c8606213..2e4eef9ee8c 100644
--- a/service/partnercentralselling/go_module_metadata.go
+++ b/service/partnercentralselling/go_module_metadata.go
@@ -3,4 +3,4 @@
 package partnercentralselling
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.3.3"
+const goModuleVersion = "1.3.4"
diff --git a/service/paymentcryptography/CHANGELOG.md b/service/paymentcryptography/CHANGELOG.md
index b6a2682c1b1..367a8b0a627 100644
--- a/service/paymentcryptography/CHANGELOG.md
+++ b/service/paymentcryptography/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/paymentcryptography/go.mod b/service/paymentcryptography/go.mod
index e9209f8ff27..5309ccafe87 100644
--- a/service/paymentcryptography/go.mod
+++ b/service/paymentcryptography/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/paymentcryptography
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/paymentcryptography/go_module_metadata.go b/service/paymentcryptography/go_module_metadata.go
index 34d807ac79f..ab62d4bd776 100644
--- a/service/paymentcryptography/go_module_metadata.go
+++ b/service/paymentcryptography/go_module_metadata.go
@@ -3,4 +3,4 @@
 package paymentcryptography
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.8"
+const goModuleVersion = "1.16.9"
diff --git a/service/paymentcryptographydata/CHANGELOG.md b/service/paymentcryptographydata/CHANGELOG.md
index e8f0b590324..4c74e1dbadb 100644
--- a/service/paymentcryptographydata/CHANGELOG.md
+++ b/service/paymentcryptographydata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/paymentcryptographydata/go.mod b/service/paymentcryptographydata/go.mod
index 075e68ccea7..dcd3ea89641 100644
--- a/service/paymentcryptographydata/go.mod
+++ b/service/paymentcryptographydata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/paymentcryptographydata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/paymentcryptographydata/go_module_metadata.go b/service/paymentcryptographydata/go_module_metadata.go
index 3b5422833bc..0d0b864b36f 100644
--- a/service/paymentcryptographydata/go_module_metadata.go
+++ b/service/paymentcryptographydata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package paymentcryptographydata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.11"
+const goModuleVersion = "1.16.12"
diff --git a/service/pcaconnectorad/CHANGELOG.md b/service/pcaconnectorad/CHANGELOG.md
index 1e587acd307..ca88ca881c1 100644
--- a/service/pcaconnectorad/CHANGELOG.md
+++ b/service/pcaconnectorad/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.9.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.9.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pcaconnectorad/go.mod b/service/pcaconnectorad/go.mod
index 7e33fb59f4e..6938372a85c 100644
--- a/service/pcaconnectorad/go.mod
+++ b/service/pcaconnectorad/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pcaconnectorad
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pcaconnectorad/go_module_metadata.go b/service/pcaconnectorad/go_module_metadata.go
index 5fdd92849e0..c62c381b8c1 100644
--- a/service/pcaconnectorad/go_module_metadata.go
+++ b/service/pcaconnectorad/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pcaconnectorad
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.9.13"
+const goModuleVersion = "1.9.14"
diff --git a/service/pcaconnectorscep/CHANGELOG.md b/service/pcaconnectorscep/CHANGELOG.md
index 8188ad3f7d2..32600dc26db 100644
--- a/service/pcaconnectorscep/CHANGELOG.md
+++ b/service/pcaconnectorscep/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.4.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.4.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pcaconnectorscep/go.mod b/service/pcaconnectorscep/go.mod
index cbe3f7d6695..09601bb0485 100644
--- a/service/pcaconnectorscep/go.mod
+++ b/service/pcaconnectorscep/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pcaconnectorscep
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pcaconnectorscep/go_module_metadata.go b/service/pcaconnectorscep/go_module_metadata.go
index 14a05fa0e95..e053252df22 100644
--- a/service/pcaconnectorscep/go_module_metadata.go
+++ b/service/pcaconnectorscep/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pcaconnectorscep
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.4.13"
+const goModuleVersion = "1.4.14"
diff --git a/service/pcs/CHANGELOG.md b/service/pcs/CHANGELOG.md
index 314c82abccf..55766e04af7 100644
--- a/service/pcs/CHANGELOG.md
+++ b/service/pcs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.2.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.2.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pcs/go.mod b/service/pcs/go.mod
index 636509c1cd2..2f23a0456c5 100644
--- a/service/pcs/go.mod
+++ b/service/pcs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pcs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pcs/go_module_metadata.go b/service/pcs/go_module_metadata.go
index f81813e4452..01cb967dbf7 100644
--- a/service/pcs/go_module_metadata.go
+++ b/service/pcs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pcs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.2.14"
+const goModuleVersion = "1.2.15"
diff --git a/service/personalize/CHANGELOG.md b/service/personalize/CHANGELOG.md
index 17c2dd71cd3..8da7bd77cbe 100644
--- a/service/personalize/CHANGELOG.md
+++ b/service/personalize/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.39.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.39.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/personalize/go.mod b/service/personalize/go.mod
index da27252ccce..24fdf0e3fdb 100644
--- a/service/personalize/go.mod
+++ b/service/personalize/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/personalize
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/personalize/go_module_metadata.go b/service/personalize/go_module_metadata.go
index 6ed2fd94415..90b2282d7a8 100644
--- a/service/personalize/go_module_metadata.go
+++ b/service/personalize/go_module_metadata.go
@@ -3,4 +3,4 @@
 package personalize
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.39.13"
+const goModuleVersion = "1.39.14"
diff --git a/service/personalizeevents/CHANGELOG.md b/service/personalizeevents/CHANGELOG.md
index 4b5fe46e159..2d354ff61f3 100644
--- a/service/personalizeevents/CHANGELOG.md
+++ b/service/personalizeevents/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/personalizeevents/go.mod b/service/personalizeevents/go.mod
index 2e06c65d40c..d9f898de28f 100644
--- a/service/personalizeevents/go.mod
+++ b/service/personalizeevents/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/personalizeevents
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/personalizeevents/go_module_metadata.go b/service/personalizeevents/go_module_metadata.go
index 1021d8eea48..fa15a2bc717 100644
--- a/service/personalizeevents/go_module_metadata.go
+++ b/service/personalizeevents/go_module_metadata.go
@@ -3,4 +3,4 @@
 package personalizeevents
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/personalizeruntime/CHANGELOG.md b/service/personalizeruntime/CHANGELOG.md
index 74750ad4a7a..e91e2053e13 100644
--- a/service/personalizeruntime/CHANGELOG.md
+++ b/service/personalizeruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/personalizeruntime/go.mod b/service/personalizeruntime/go.mod
index 492f9ceb85b..b0c102e5bb1 100644
--- a/service/personalizeruntime/go.mod
+++ b/service/personalizeruntime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/personalizeruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/personalizeruntime/go_module_metadata.go b/service/personalizeruntime/go_module_metadata.go
index 50d4f264787..b7ca7250d8b 100644
--- a/service/personalizeruntime/go_module_metadata.go
+++ b/service/personalizeruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package personalizeruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/pi/CHANGELOG.md b/service/pi/CHANGELOG.md
index 7c5a24fb6e8..71f530b7043 100644
--- a/service/pi/CHANGELOG.md
+++ b/service/pi/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pi/go.mod b/service/pi/go.mod
index 0671d1735ca..58430ca6b39 100644
--- a/service/pi/go.mod
+++ b/service/pi/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pi
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pi/go_module_metadata.go b/service/pi/go_module_metadata.go
index 70b0012bf93..dc56ad24822 100644
--- a/service/pi/go_module_metadata.go
+++ b/service/pi/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pi
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.15"
+const goModuleVersion = "1.29.16"
diff --git a/service/pinpoint/CHANGELOG.md b/service/pinpoint/CHANGELOG.md
index 1c33e76c06b..a2388b6d6a2 100644
--- a/service/pinpoint/CHANGELOG.md
+++ b/service/pinpoint/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pinpoint/go.mod b/service/pinpoint/go.mod
index 8f56555ea70..eaec3a31d18 100644
--- a/service/pinpoint/go.mod
+++ b/service/pinpoint/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pinpoint
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pinpoint/go_module_metadata.go b/service/pinpoint/go_module_metadata.go
index 9df886967bc..80c53161ca4 100644
--- a/service/pinpoint/go_module_metadata.go
+++ b/service/pinpoint/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pinpoint
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/pinpointemail/CHANGELOG.md b/service/pinpointemail/CHANGELOG.md
index 511df4e009e..4ca444515b3 100644
--- a/service/pinpointemail/CHANGELOG.md
+++ b/service/pinpointemail/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pinpointemail/go.mod b/service/pinpointemail/go.mod
index fbfddd2eecc..ecc424e77d4 100644
--- a/service/pinpointemail/go.mod
+++ b/service/pinpointemail/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pinpointemail
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pinpointemail/go_module_metadata.go b/service/pinpointemail/go_module_metadata.go
index b35a132460b..deadcf9995d 100644
--- a/service/pinpointemail/go_module_metadata.go
+++ b/service/pinpointemail/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pinpointemail
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/pinpointsmsvoice/CHANGELOG.md b/service/pinpointsmsvoice/CHANGELOG.md
index 8108cf49517..1e2b9003756 100644
--- a/service/pinpointsmsvoice/CHANGELOG.md
+++ b/service/pinpointsmsvoice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pinpointsmsvoice/go.mod b/service/pinpointsmsvoice/go.mod
index 6c8a16c2e8b..0b8b3dc744a 100644
--- a/service/pinpointsmsvoice/go.mod
+++ b/service/pinpointsmsvoice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pinpointsmsvoice/go_module_metadata.go b/service/pinpointsmsvoice/go_module_metadata.go
index 8ad14e6472d..9723f3b0837 100644
--- a/service/pinpointsmsvoice/go_module_metadata.go
+++ b/service/pinpointsmsvoice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pinpointsmsvoice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/pinpointsmsvoicev2/CHANGELOG.md b/service/pinpointsmsvoicev2/CHANGELOG.md
index 367b5e9f671..8764e96a9e8 100644
--- a/service/pinpointsmsvoicev2/CHANGELOG.md
+++ b/service/pinpointsmsvoicev2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.18.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.18.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pinpointsmsvoicev2/go.mod b/service/pinpointsmsvoicev2/go.mod
index f074117de38..9e16309cb06 100644
--- a/service/pinpointsmsvoicev2/go.mod
+++ b/service/pinpointsmsvoicev2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pinpointsmsvoicev2/go_module_metadata.go b/service/pinpointsmsvoicev2/go_module_metadata.go
index d894e274b20..b3aadfc9fa0 100644
--- a/service/pinpointsmsvoicev2/go_module_metadata.go
+++ b/service/pinpointsmsvoicev2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pinpointsmsvoicev2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.18.8"
+const goModuleVersion = "1.18.9"
diff --git a/service/pipes/CHANGELOG.md b/service/pipes/CHANGELOG.md
index 5490c197c81..da97041f404 100644
--- a/service/pipes/CHANGELOG.md
+++ b/service/pipes/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.18.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.18.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pipes/go.mod b/service/pipes/go.mod
index 80d05418a33..d6a84e7938a 100644
--- a/service/pipes/go.mod
+++ b/service/pipes/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pipes
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pipes/go_module_metadata.go b/service/pipes/go_module_metadata.go
index 6928753ee95..5d98b5ca016 100644
--- a/service/pipes/go_module_metadata.go
+++ b/service/pipes/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pipes
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.18.11"
+const goModuleVersion = "1.18.12"
diff --git a/service/polly/CHANGELOG.md b/service/polly/CHANGELOG.md
index 3642c8df64f..b16b7873f53 100644
--- a/service/polly/CHANGELOG.md
+++ b/service/polly/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.45.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/polly/go.mod b/service/polly/go.mod
index c8cb73ca89c..89465369ece 100644
--- a/service/polly/go.mod
+++ b/service/polly/go.mod
@@ -3,11 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/polly
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/polly/go_module_metadata.go b/service/polly/go_module_metadata.go
index 73190a49ceb..083221a7551 100644
--- a/service/polly/go_module_metadata.go
+++ b/service/polly/go_module_metadata.go
@@ -3,4 +3,4 @@
 package polly
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.14"
+const goModuleVersion = "1.45.15"
diff --git a/service/pricing/CHANGELOG.md b/service/pricing/CHANGELOG.md
index 9174979b915..4fb3735dfbb 100644
--- a/service/pricing/CHANGELOG.md
+++ b/service/pricing/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/pricing/go.mod b/service/pricing/go.mod
index 8475479fdae..b4470e25874 100644
--- a/service/pricing/go.mod
+++ b/service/pricing/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/pricing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/pricing/go_module_metadata.go b/service/pricing/go_module_metadata.go
index cb519c1878c..0f94229b311 100644
--- a/service/pricing/go_module_metadata.go
+++ b/service/pricing/go_module_metadata.go
@@ -3,4 +3,4 @@
 package pricing
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.13"
+const goModuleVersion = "1.32.14"
diff --git a/service/privatenetworks/CHANGELOG.md b/service/privatenetworks/CHANGELOG.md
index 6ba7e41a301..19012f2dbba 100644
--- a/service/privatenetworks/CHANGELOG.md
+++ b/service/privatenetworks/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.13.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.13.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/privatenetworks/go.mod b/service/privatenetworks/go.mod
index b5323c485e4..005827e92c8 100644
--- a/service/privatenetworks/go.mod
+++ b/service/privatenetworks/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/privatenetworks
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/privatenetworks/go_module_metadata.go b/service/privatenetworks/go_module_metadata.go
index 8559ae4f5a9..5e88c54fdfb 100644
--- a/service/privatenetworks/go_module_metadata.go
+++ b/service/privatenetworks/go_module_metadata.go
@@ -3,4 +3,4 @@
 package privatenetworks
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.13.13"
+const goModuleVersion = "1.13.14"
diff --git a/service/proton/CHANGELOG.md b/service/proton/CHANGELOG.md
index 1bf8e164392..6a58a4758a5 100644
--- a/service/proton/CHANGELOG.md
+++ b/service/proton/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.33.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/proton/api_op_GetComponent.go b/service/proton/api_op_GetComponent.go
index 81dd6e5f981..8c14391aa8e 100644
--- a/service/proton/api_op_GetComponent.go
+++ b/service/proton/api_op_GetComponent.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -317,35 +316,31 @@ func (w *ComponentDeployedWaiter) WaitForOutput(ctx context.Context, params *Get
 func componentDeployedStateRetryable(ctx context.Context, input *GetComponentInput, output *GetComponentOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("component.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Component
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("component.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Component
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -523,18 +518,16 @@ func componentDeletedStateRetryable(ctx context.Context, input *GetComponentInpu
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("component.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Component
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/api_op_GetEnvironment.go b/service/proton/api_op_GetEnvironment.go
index 26f0dadf417..5dddb91afa8 100644
--- a/service/proton/api_op_GetEnvironment.go
+++ b/service/proton/api_op_GetEnvironment.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -316,35 +315,31 @@ func (w *EnvironmentDeployedWaiter) WaitForOutput(ctx context.Context, params *G
 func environmentDeployedStateRetryable(ctx context.Context, input *GetEnvironmentInput, output *GetEnvironmentOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("environment.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environment
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("environment.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Environment
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/api_op_GetEnvironmentTemplateVersion.go b/service/proton/api_op_GetEnvironmentTemplateVersion.go
index b3436f2ff61..5f85ee8f617 100644
--- a/service/proton/api_op_GetEnvironmentTemplateVersion.go
+++ b/service/proton/api_op_GetEnvironmentTemplateVersion.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -330,52 +329,46 @@ func (w *EnvironmentTemplateVersionRegisteredWaiter) WaitForOutput(ctx context.C
 func environmentTemplateVersionRegisteredStateRetryable(ctx context.Context, input *GetEnvironmentTemplateVersionInput, output *GetEnvironmentTemplateVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("environmentTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.EnvironmentTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DRAFT"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("environmentTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.EnvironmentTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PUBLISHED"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("environmentTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.EnvironmentTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "REGISTRATION_FAILED"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/api_op_GetService.go b/service/proton/api_op_GetService.go
index 463b9915c28..6c88f39f56e 100644
--- a/service/proton/api_op_GetService.go
+++ b/service/proton/api_op_GetService.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -313,69 +312,61 @@ func (w *ServiceCreatedWaiter) WaitForOutput(ctx context.Context, params *GetSer
 func serviceCreatedStateRetryable(ctx context.Context, input *GetServiceInput, output *GetServiceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED_CLEANUP_COMPLETE"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED_CLEANUP_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -546,86 +537,76 @@ func (w *ServiceUpdatedWaiter) WaitForOutput(ctx context.Context, params *GetSer
 func serviceUpdatedStateRetryable(ctx context.Context, input *GetServiceInput, output *GetServiceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATE_FAILED_CLEANUP_COMPLETE"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATE_FAILED_CLEANUP_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATE_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATE_COMPLETE_CLEANUP_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -803,18 +784,16 @@ func serviceDeletedStateRetryable(ctx context.Context, input *GetServiceInput, o
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 types.ServiceStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.ServiceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ServiceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -987,35 +966,41 @@ func (w *ServicePipelineDeployedWaiter) WaitForOutput(ctx context.Context, param
 func servicePipelineDeployedStateRetryable(ctx context.Context, input *GetServiceInput, output *GetServiceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.pipeline.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 *types.ServicePipeline
+		if v1 != nil {
+			v3 := v1.Pipeline
+			v2 = v3
 		}
-
-		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
+		var v4 types.DeploymentStatus
+		if v2 != nil {
+			v5 := v2.DeploymentStatus
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "SUCCEEDED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("service.pipeline.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Service
+		var v2 *types.ServicePipeline
+		if v1 != nil {
+			v3 := v1.Pipeline
+			v2 = v3
 		}
-
-		expectedValue := "FAILED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
+		var v4 types.DeploymentStatus
+		if v2 != nil {
+			v5 := v2.DeploymentStatus
+			v4 = v5
 		}
-
-		if string(value) == expectedValue {
+		expectedValue := "FAILED"
+		var pathValue string
+		pathValue = string(v4)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/api_op_GetServiceInstance.go b/service/proton/api_op_GetServiceInstance.go
index e80186c9bc4..8ad13f18842 100644
--- a/service/proton/api_op_GetServiceInstance.go
+++ b/service/proton/api_op_GetServiceInstance.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -322,35 +321,31 @@ func (w *ServiceInstanceDeployedWaiter) WaitForOutput(ctx context.Context, param
 func serviceInstanceDeployedStateRetryable(ctx context.Context, input *GetServiceInstanceInput, output *GetServiceInstanceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("serviceInstance.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ServiceInstance
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "SUCCEEDED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("serviceInstance.deploymentStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ServiceInstance
+		var v2 types.DeploymentStatus
+		if v1 != nil {
+			v3 := v1.DeploymentStatus
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.DeploymentStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.DeploymentStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/api_op_GetServiceTemplateVersion.go b/service/proton/api_op_GetServiceTemplateVersion.go
index c1b00cc93db..d4fdff157d4 100644
--- a/service/proton/api_op_GetServiceTemplateVersion.go
+++ b/service/proton/api_op_GetServiceTemplateVersion.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -330,52 +329,46 @@ func (w *ServiceTemplateVersionRegisteredWaiter) WaitForOutput(ctx context.Conte
 func serviceTemplateVersionRegisteredStateRetryable(ctx context.Context, input *GetServiceTemplateVersionInput, output *GetServiceTemplateVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("serviceTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ServiceTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DRAFT"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("serviceTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ServiceTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PUBLISHED"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("serviceTemplateVersion.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ServiceTemplateVersion
+		var v2 types.TemplateVersionStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "REGISTRATION_FAILED"
-		value, ok := pathValue.(types.TemplateVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TemplateVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/proton/generated.json b/service/proton/generated.json
index d751d91d0c2..d2fb40b262f 100644
--- a/service/proton/generated.json
+++ b/service/proton/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/proton/go.mod b/service/proton/go.mod
index 09bc7d604da..ff0fa6e4615 100644
--- a/service/proton/go.mod
+++ b/service/proton/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/proton
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/proton/go.sum b/service/proton/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/proton/go.sum
+++ b/service/proton/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/proton/go_module_metadata.go b/service/proton/go_module_metadata.go
index 0cbe8ec3076..f9a82b8c37a 100644
--- a/service/proton/go_module_metadata.go
+++ b/service/proton/go_module_metadata.go
@@ -3,4 +3,4 @@
 package proton
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.14"
+const goModuleVersion = "1.33.15"
diff --git a/service/qapps/CHANGELOG.md b/service/qapps/CHANGELOG.md
index 409425a66be..04427d0aacd 100644
--- a/service/qapps/CHANGELOG.md
+++ b/service/qapps/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.6.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.6.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/qapps/go.mod b/service/qapps/go.mod
index 5666a1424cf..6d1ccbef008 100644
--- a/service/qapps/go.mod
+++ b/service/qapps/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/qapps
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/qapps/go_module_metadata.go b/service/qapps/go_module_metadata.go
index b531d924518..fd2c54d0a76 100644
--- a/service/qapps/go_module_metadata.go
+++ b/service/qapps/go_module_metadata.go
@@ -3,4 +3,4 @@
 package qapps
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.6.6"
+const goModuleVersion = "1.6.7"
diff --git a/service/qbusiness/CHANGELOG.md b/service/qbusiness/CHANGELOG.md
index 6400d9d33f4..807495e4b65 100644
--- a/service/qbusiness/CHANGELOG.md
+++ b/service/qbusiness/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.1 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.0 (2025-01-30)
 
 * **Feature**: Added APIs to manage QBusiness user subscriptions
diff --git a/service/qbusiness/go.mod b/service/qbusiness/go.mod
index 12a5383edd2..d78ae858fc2 100644
--- a/service/qbusiness/go.mod
+++ b/service/qbusiness/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/qbusiness
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/qbusiness/go_module_metadata.go b/service/qbusiness/go_module_metadata.go
index feac2e2b5d8..7fa5872feac 100644
--- a/service/qbusiness/go_module_metadata.go
+++ b/service/qbusiness/go_module_metadata.go
@@ -3,4 +3,4 @@
 package qbusiness
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.0"
+const goModuleVersion = "1.20.1"
diff --git a/service/qconnect/CHANGELOG.md b/service/qconnect/CHANGELOG.md
index d4de67b0d89..444347ef6c7 100644
--- a/service/qconnect/CHANGELOG.md
+++ b/service/qconnect/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.15.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.15.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/qconnect/go.mod b/service/qconnect/go.mod
index 935aaa8fd05..fc8a7009380 100644
--- a/service/qconnect/go.mod
+++ b/service/qconnect/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/qconnect
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/qconnect/go_module_metadata.go b/service/qconnect/go_module_metadata.go
index 1aa356354b4..df57509385d 100644
--- a/service/qconnect/go_module_metadata.go
+++ b/service/qconnect/go_module_metadata.go
@@ -3,4 +3,4 @@
 package qconnect
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.15.5"
+const goModuleVersion = "1.15.6"
diff --git a/service/qldb/CHANGELOG.md b/service/qldb/CHANGELOG.md
index e04d9669dc0..7be6fc7aa7c 100644
--- a/service/qldb/CHANGELOG.md
+++ b/service/qldb/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/qldb/go.mod b/service/qldb/go.mod
index d4a9f386304..500407604f0 100644
--- a/service/qldb/go.mod
+++ b/service/qldb/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/qldb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/qldb/go_module_metadata.go b/service/qldb/go_module_metadata.go
index 5fbc457f958..f30d0f328d5 100644
--- a/service/qldb/go_module_metadata.go
+++ b/service/qldb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package qldb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/qldbsession/CHANGELOG.md b/service/qldbsession/CHANGELOG.md
index fe920be6656..81b61ef7f02 100644
--- a/service/qldbsession/CHANGELOG.md
+++ b/service/qldbsession/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/qldbsession/go.mod b/service/qldbsession/go.mod
index 69bafb32c4d..399e465c136 100644
--- a/service/qldbsession/go.mod
+++ b/service/qldbsession/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/qldbsession
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/qldbsession/go_module_metadata.go b/service/qldbsession/go_module_metadata.go
index 25b3c8d6f37..3fe043759ab 100644
--- a/service/qldbsession/go_module_metadata.go
+++ b/service/qldbsession/go_module_metadata.go
@@ -3,4 +3,4 @@
 package qldbsession
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/quicksight/CHANGELOG.md b/service/quicksight/CHANGELOG.md
index 8ed86006f54..36dc81d6337 100644
--- a/service/quicksight/CHANGELOG.md
+++ b/service/quicksight/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.83.3 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.83.2 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/quicksight/go.mod b/service/quicksight/go.mod
index ea9330fc590..9b7342a4c30 100644
--- a/service/quicksight/go.mod
+++ b/service/quicksight/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/quicksight
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/quicksight/go_module_metadata.go b/service/quicksight/go_module_metadata.go
index cc32888b3e3..65f6b8ed9e8 100644
--- a/service/quicksight/go_module_metadata.go
+++ b/service/quicksight/go_module_metadata.go
@@ -3,4 +3,4 @@
 package quicksight
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.83.2"
+const goModuleVersion = "1.83.3"
diff --git a/service/ram/CHANGELOG.md b/service/ram/CHANGELOG.md
index faef0218188..b48c26af51e 100644
--- a/service/ram/CHANGELOG.md
+++ b/service/ram/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ram/go.mod b/service/ram/go.mod
index 8f2f316be6f..70bb961681d 100644
--- a/service/ram/go.mod
+++ b/service/ram/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ram
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ram/go_module_metadata.go b/service/ram/go_module_metadata.go
index 85ac0faa1ec..f67cae811df 100644
--- a/service/ram/go_module_metadata.go
+++ b/service/ram/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ram
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.15"
+const goModuleVersion = "1.29.16"
diff --git a/service/rbin/CHANGELOG.md b/service/rbin/CHANGELOG.md
index d824426b631..12b5e9f2c63 100644
--- a/service/rbin/CHANGELOG.md
+++ b/service/rbin/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rbin/go.mod b/service/rbin/go.mod
index dcf20633309..30f7f94cee5 100644
--- a/service/rbin/go.mod
+++ b/service/rbin/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/rbin
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/rbin/go_module_metadata.go b/service/rbin/go_module_metadata.go
index 2b4ecb2cd1d..5c9b0e5c3b8 100644
--- a/service/rbin/go_module_metadata.go
+++ b/service/rbin/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rbin
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.10"
+const goModuleVersion = "1.21.11"
diff --git a/service/rds/CHANGELOG.md b/service/rds/CHANGELOG.md
index da5ee83cff6..4f1c2a4b162 100644
--- a/service/rds/CHANGELOG.md
+++ b/service/rds/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.93.10 (2025-01-31)
+
+* **Documentation**: Updates to Aurora MySQL and Aurora PostgreSQL API pages with instance log type in the create and modify DB Cluster.
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.93.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rds/api_op_CreateDBCluster.go b/service/rds/api_op_CreateDBCluster.go
index 9d9e293a17e..83241011482 100644
--- a/service/rds/api_op_CreateDBCluster.go
+++ b/service/rds/api_op_CreateDBCluster.go
@@ -259,9 +259,9 @@ type CreateDBClusterInput struct {
 	//
 	// The following values are valid for each DB engine:
 	//
-	//   - Aurora MySQL - audit | error | general | slowquery
+	//   - Aurora MySQL - audit | error | general | instance | slowquery
 	//
-	//   - Aurora PostgreSQL - postgresql
+	//   - Aurora PostgreSQL - instance | postgresql
 	//
 	//   - RDS for MySQL - error | general | slowquery
 	//
diff --git a/service/rds/api_op_CreateDBInstance.go b/service/rds/api_op_CreateDBInstance.go
index 41303c87d85..45d06276f50 100644
--- a/service/rds/api_op_CreateDBInstance.go
+++ b/service/rds/api_op_CreateDBInstance.go
@@ -1103,7 +1103,8 @@ type CreateDBInstanceInput struct {
 	// instances is managed by the DB cluster.
 	StorageEncrypted *bool
 
-	// The storage throughput value for the DB instance.
+	// The storage throughput value, in mebibyte per second (MiBps), for the DB
+	// instance.
 	//
 	// This setting applies only to the gp3 storage type.
 	//
diff --git a/service/rds/api_op_DescribeDBClusterSnapshots.go b/service/rds/api_op_DescribeDBClusterSnapshots.go
index 6708c67226a..82f3f517c7a 100644
--- a/service/rds/api_op_DescribeDBClusterSnapshots.go
+++ b/service/rds/api_op_DescribeDBClusterSnapshots.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -423,29 +422,20 @@ func (w *DBClusterSnapshotAvailableWaiter) WaitForOutput(ctx context.Context, pa
 func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBClusterSnapshotsInput, output *DescribeDBClusterSnapshotsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -455,122 +445,117 @@ func dBClusterSnapshotAvailableStateRetryable(ctx context.Context, input *Descri
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -742,22 +727,16 @@ func (w *DBClusterSnapshotDeletedWaiter) WaitForOutput(ctx context.Context, para
 func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *DescribeDBClusterSnapshotsInput, output *DescribeDBClusterSnapshotsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(DBClusterSnapshots) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.DBClusterSnapshots
+		v2 := len(v1)
+		v3 := 0
+		v4 := int64(v2) == int64(v3)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v4 == bv {
 			return false, nil
 		}
 	}
@@ -770,98 +749,94 @@ func dBClusterSnapshotDeletedStateRetryable(ctx context.Context, input *Describe
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusterSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusterSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/rds/api_op_DescribeDBClusters.go b/service/rds/api_op_DescribeDBClusters.go
index ae9068aa6bd..557f173e7ad 100644
--- a/service/rds/api_op_DescribeDBClusters.go
+++ b/service/rds/api_op_DescribeDBClusters.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -374,29 +373,20 @@ func (w *DBClusterAvailableWaiter) WaitForOutput(ctx context.Context, params *De
 func dBClusterAvailableStateRetryable(ctx context.Context, input *DescribeDBClustersInput, output *DescribeDBClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -406,122 +396,117 @@ func dBClusterAvailableStateRetryable(ctx context.Context, input *DescribeDBClus
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -691,22 +676,16 @@ func (w *DBClusterDeletedWaiter) WaitForOutput(ctx context.Context, params *Desc
 func dBClusterDeletedStateRetryable(ctx context.Context, input *DescribeDBClustersInput, output *DescribeDBClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(DBClusters) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.DBClusters
+		v2 := len(v1)
+		v3 := 0
+		v4 := int64(v2) == int64(v3)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v4 == bv {
 			return false, nil
 		}
 	}
@@ -719,98 +698,94 @@ func dBClusterDeletedStateRetryable(ctx context.Context, input *DescribeDBCluste
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBClusters[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBClusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/rds/api_op_DescribeDBInstances.go b/service/rds/api_op_DescribeDBInstances.go
index b7adb1dbd62..546a349b931 100644
--- a/service/rds/api_op_DescribeDBInstances.go
+++ b/service/rds/api_op_DescribeDBInstances.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -368,29 +367,20 @@ func (w *DBInstanceAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -400,122 +390,117 @@ func dBInstanceAvailableStateRetryable(ctx context.Context, input *DescribeDBIns
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -685,22 +670,16 @@ func (w *DBInstanceDeletedWaiter) WaitForOutput(ctx context.Context, params *Des
 func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInstancesInput, output *DescribeDBInstancesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(DBInstances) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.DBInstances
+		v2 := len(v1)
+		v3 := 0
+		v4 := int64(v2) == int64(v3)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v4 == bv {
 			return false, nil
 		}
 	}
@@ -718,98 +697,94 @@ func dBInstanceDeletedStateRetryable(ctx context.Context, input *DescribeDBInsta
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBInstances[].DBInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBInstances
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.DBInstanceStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/rds/api_op_DescribeDBSnapshots.go b/service/rds/api_op_DescribeDBSnapshots.go
index 6df834a24e9..27c48461b18 100644
--- a/service/rds/api_op_DescribeDBSnapshots.go
+++ b/service/rds/api_op_DescribeDBSnapshots.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -427,29 +426,20 @@ func (w *DBSnapshotAvailableWaiter) WaitForOutput(ctx context.Context, params *D
 func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSnapshotsInput, output *DescribeDBSnapshotsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -459,122 +449,117 @@ func dBSnapshotAvailableStateRetryable(ctx context.Context, input *DescribeDBSna
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -744,22 +729,16 @@ func (w *DBSnapshotDeletedWaiter) WaitForOutput(ctx context.Context, params *Des
 func dBSnapshotDeletedStateRetryable(ctx context.Context, input *DescribeDBSnapshotsInput, output *DescribeDBSnapshotsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(DBSnapshots) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.DBSnapshots
+		v2 := len(v1)
+		v3 := 0
+		v4 := int64(v2) == int64(v3)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v4 == bv {
 			return false, nil
 		}
 	}
@@ -777,98 +756,94 @@ func dBSnapshotDeletedStateRetryable(ctx context.Context, input *DescribeDBSnaps
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "rebooting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("DBSnapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.DBSnapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "resetting-master-credentials"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/rds/api_op_DescribeTenantDatabases.go b/service/rds/api_op_DescribeTenantDatabases.go
index 784ca183463..22ea4a631aa 100644
--- a/service/rds/api_op_DescribeTenantDatabases.go
+++ b/service/rds/api_op_DescribeTenantDatabases.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"strconv"
 	"time"
 )
@@ -352,29 +351,20 @@ func (w *TenantDatabaseAvailableWaiter) WaitForOutput(ctx context.Context, param
 func tenantDatabaseAvailableStateRetryable(ctx context.Context, input *DescribeTenantDatabasesInput, output *DescribeTenantDatabasesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TenantDatabases[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TenantDatabases
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -384,74 +374,71 @@ func tenantDatabaseAvailableStateRetryable(ctx context.Context, input *DescribeT
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TenantDatabases[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TenantDatabases
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TenantDatabases[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TenantDatabases
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-parameters"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TenantDatabases[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.TenantDatabases
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "incompatible-restore"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -623,22 +610,16 @@ func (w *TenantDatabaseDeletedWaiter) WaitForOutput(ctx context.Context, params
 func tenantDatabaseDeletedStateRetryable(ctx context.Context, input *DescribeTenantDatabasesInput, output *DescribeTenantDatabasesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("length(TenantDatabases) == `0`", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TenantDatabases
+		v2 := len(v1)
+		v3 := 0
+		v4 := int64(v2) == int64(v3)
 		expectedValue := "true"
 		bv, err := strconv.ParseBool(expectedValue)
 		if err != nil {
 			return false, fmt.Errorf("error parsing boolean from string %w", err)
 		}
-		value, ok := pathValue.(bool)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected bool value got %T", pathValue)
-		}
-
-		if value == bv {
+		if v4 == bv {
 			return false, nil
 		}
 	}
diff --git a/service/rds/api_op_ModifyDBCluster.go b/service/rds/api_op_ModifyDBCluster.go
index aa85a2b1baa..990d1f33572 100644
--- a/service/rds/api_op_ModifyDBCluster.go
+++ b/service/rds/api_op_ModifyDBCluster.go
@@ -146,9 +146,9 @@ type ModifyDBClusterInput struct {
 	//
 	// The following values are valid for each DB engine:
 	//
-	//   - Aurora MySQL - audit | error | general | slowquery
+	//   - Aurora MySQL - audit | error | general | instance | slowquery
 	//
-	//   - Aurora PostgreSQL - postgresql
+	//   - Aurora PostgreSQL - instance | postgresql
 	//
 	//   - RDS for MySQL - error | general | slowquery
 	//
diff --git a/service/rds/api_op_RestoreDBClusterFromS3.go b/service/rds/api_op_RestoreDBClusterFromS3.go
index 0ea3b0259a2..f13b24c47ac 100644
--- a/service/rds/api_op_RestoreDBClusterFromS3.go
+++ b/service/rds/api_op_RestoreDBClusterFromS3.go
@@ -190,7 +190,14 @@ type RestoreDBClusterFromS3Input struct {
 	//
 	// Aurora MySQL
 	//
-	// Possible values are audit , error , general , and slowquery .
+	// Possible values are audit , error , general , instance , and slowquery .
+	//
+	// Aurora PostgreSQL
+	//
+	// Possible value are instance and postgresql .
+	//
+	// For more information about exporting CloudWatch Logs for Amazon RDS, see [Publishing Database Logs to Amazon CloudWatch Logs] in
+	// the Amazon RDS User Guide.
 	//
 	// For more information about exporting CloudWatch Logs for Amazon Aurora, see [Publishing Database Logs to Amazon CloudWatch Logs] in
 	// the Amazon Aurora User Guide.
diff --git a/service/rds/api_op_RestoreDBClusterFromSnapshot.go b/service/rds/api_op_RestoreDBClusterFromSnapshot.go
index 9e8d5ecbceb..2c7ed475123 100644
--- a/service/rds/api_op_RestoreDBClusterFromSnapshot.go
+++ b/service/rds/api_op_RestoreDBClusterFromSnapshot.go
@@ -201,11 +201,11 @@ type RestoreDBClusterFromSnapshotInput struct {
 	//
 	// Aurora MySQL
 	//
-	// Possible values are audit , error , general , and slowquery .
+	// Possible values are audit , error , general , instance , and slowquery .
 	//
 	// Aurora PostgreSQL
 	//
-	// Possible value is postgresql .
+	// Possible value are instance and postgresql .
 	//
 	// For more information about exporting CloudWatch Logs for Amazon RDS, see [Publishing Database Logs to Amazon CloudWatch Logs] in
 	// the Amazon RDS User Guide.
diff --git a/service/rds/api_op_RestoreDBClusterToPointInTime.go b/service/rds/api_op_RestoreDBClusterToPointInTime.go
index 3d425e4bd5d..5e4dda4dff2 100644
--- a/service/rds/api_op_RestoreDBClusterToPointInTime.go
+++ b/service/rds/api_op_RestoreDBClusterToPointInTime.go
@@ -162,11 +162,11 @@ type RestoreDBClusterToPointInTimeInput struct {
 	//
 	// Aurora MySQL
 	//
-	// Possible values are audit , error , general , and slowquery .
+	// Possible values are audit , error , general , instance , and slowquery .
 	//
 	// Aurora PostgreSQL
 	//
-	// Possible value is postgresql .
+	// Possible value are instance and postgresql .
 	//
 	// For more information about exporting CloudWatch Logs for Amazon RDS, see [Publishing Database Logs to Amazon CloudWatch Logs] in
 	// the Amazon RDS User Guide.
diff --git a/service/rds/api_op_StopDBInstance.go b/service/rds/api_op_StopDBInstance.go
index 5494e2dcb00..a6dda16c2db 100644
--- a/service/rds/api_op_StopDBInstance.go
+++ b/service/rds/api_op_StopDBInstance.go
@@ -11,10 +11,11 @@ import (
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
-// Stops an Amazon RDS DB instance. When you stop a DB instance, Amazon RDS
-// retains the DB instance's metadata, including its endpoint, DB parameter group,
-// and option group membership. Amazon RDS also retains the transaction logs so you
-// can do a point-in-time restore if necessary.
+// Stops an Amazon RDS DB instance temporarily. When you stop a DB instance,
+// Amazon RDS retains the DB instance's metadata, including its endpoint, DB
+// parameter group, and option group membership. Amazon RDS also retains the
+// transaction logs so you can do a point-in-time restore if necessary. The
+// instance restarts automatically after 7 days.
 //
 // For more information, see [Stopping an Amazon RDS DB Instance Temporarily] in the Amazon RDS User Guide.
 //
diff --git a/service/rds/generated.json b/service/rds/generated.json
index 8c918bdf7c7..42463e69a09 100644
--- a/service/rds/generated.json
+++ b/service/rds/generated.json
@@ -5,8 +5,7 @@
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding": "v1.0.5",
         "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url": "v1.0.7",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/rds/go.mod b/service/rds/go.mod
index b350201ddc3..0286f40713a 100644
--- a/service/rds/go.mod
+++ b/service/rds/go.mod
@@ -3,13 +3,12 @@ module github.com/aws/aws-sdk-go-v2/service/rds
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/rds/go.sum b/service/rds/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/rds/go.sum
+++ b/service/rds/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/rds/go_module_metadata.go b/service/rds/go_module_metadata.go
index b2a9f0f5558..6f1ae1086cf 100644
--- a/service/rds/go_module_metadata.go
+++ b/service/rds/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rds
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.93.9"
+const goModuleVersion = "1.93.10"
diff --git a/service/rds/types/types.go b/service/rds/types/types.go
index d03dd191f38..27a0d2a8b8a 100644
--- a/service/rds/types/types.go
+++ b/service/rds/types/types.go
@@ -642,7 +642,17 @@ type DBCluster struct {
 	// associated with.
 	CharacterSetName *string
 
-	// The ID of the clone group with which the DB cluster is associated.
+	// The ID of the clone group with which the DB cluster is associated. For newly
+	// created clusters, the ID is typically null.
+	//
+	// If you clone a DB cluster when the ID is null, the operation populates the ID
+	// value for the source cluster and the clone because both clusters become part of
+	// the same clone group. Even if you delete the clone cluster, the clone group ID
+	// remains for the lifetime of the source cluster to show that it was used in a
+	// cloning operation.
+	//
+	// For PITR, the clone group ID is inherited from the source cluster. For snapshot
+	// restore operations, the clone group ID isn't inherited from the source cluster.
 	CloneGroupId *string
 
 	// The time when the DB cluster was created, in Universal Coordinated Time (UTC).
diff --git a/service/rdsdata/CHANGELOG.md b/service/rdsdata/CHANGELOG.md
index 9524b139728..0b2065ae7b9 100644
--- a/service/rdsdata/CHANGELOG.md
+++ b/service/rdsdata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rdsdata/go.mod b/service/rdsdata/go.mod
index 41f1bccb9eb..080a37aecb3 100644
--- a/service/rdsdata/go.mod
+++ b/service/rdsdata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/rdsdata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/rdsdata/go_module_metadata.go b/service/rdsdata/go_module_metadata.go
index 33b6f6dc28a..b18a9d488ab 100644
--- a/service/rdsdata/go_module_metadata.go
+++ b/service/rdsdata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rdsdata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.7"
+const goModuleVersion = "1.26.8"
diff --git a/service/redshift/CHANGELOG.md b/service/redshift/CHANGELOG.md
index dbbd6264d15..1d385bfb4dc 100644
--- a/service/redshift/CHANGELOG.md
+++ b/service/redshift/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.53.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.53.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/redshift/api_op_DescribeClusterSnapshots.go b/service/redshift/api_op_DescribeClusterSnapshots.go
index 74a81b4776a..1ef12218964 100644
--- a/service/redshift/api_op_DescribeClusterSnapshots.go
+++ b/service/redshift/api_op_DescribeClusterSnapshots.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -423,29 +422,20 @@ func (w *SnapshotAvailableWaiter) WaitForOutput(ctx context.Context, params *Des
 func snapshotAvailableStateRetryable(ctx context.Context, input *DescribeClusterSnapshotsInput, output *DescribeClusterSnapshotsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Snapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Snapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -455,50 +445,48 @@ func snapshotAvailableStateRetryable(ctx context.Context, input *DescribeCluster
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Snapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Snapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "failed"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Snapshots[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Snapshots
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.Status
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleted"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/redshift/api_op_DescribeClusters.go b/service/redshift/api_op_DescribeClusters.go
index 5406953e24c..6efce7a87a3 100644
--- a/service/redshift/api_op_DescribeClusters.go
+++ b/service/redshift/api_op_DescribeClusters.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -370,29 +369,20 @@ func (w *ClusterAvailableWaiter) WaitForOutput(ctx context.Context, params *Desc
 func clusterAvailableStateRetryable(ctx context.Context, input *DescribeClustersInput, output *DescribeClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].ClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "available"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -402,26 +392,25 @@ func clusterAvailableStateRetryable(ctx context.Context, input *DescribeClusters
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].ClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -615,50 +604,48 @@ func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClustersIn
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].ClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "creating"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].ClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "modifying"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -828,29 +815,25 @@ func (w *ClusterRestoredWaiter) WaitForOutput(ctx context.Context, params *Descr
 func clusterRestoredStateRetryable(ctx context.Context, input *DescribeClustersInput, output *DescribeClustersOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].RestoreStatus.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.RestoreStatus
+			var v4 *string
+			if v3 != nil {
+				v5 := v3.Status
+				v4 = v5
+			}
+			if v4 != nil {
+				v2 = append(v2, *v4)
+			}
 		}
-
 		expectedValue := "completed"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
-			}
-
-			if string(*value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -860,26 +843,25 @@ func clusterRestoredStateRetryable(ctx context.Context, input *DescribeClustersI
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Clusters[].ClusterStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Clusters
+		var v2 []string
+		for _, v := range v1 {
+			v3 := v.ClusterStatus
+			if v3 != nil {
+				v2 = append(v2, *v3)
+			}
 		}
-
 		expectedValue := "deleting"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(*string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected *string value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(*value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/redshift/generated.json b/service/redshift/generated.json
index 44983d56b70..81cbbbaea4d 100644
--- a/service/redshift/generated.json
+++ b/service/redshift/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/redshift/go.mod b/service/redshift/go.mod
index c7496a8ff9b..0fa70fe1594 100644
--- a/service/redshift/go.mod
+++ b/service/redshift/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/redshift
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/redshift/go.sum b/service/redshift/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/redshift/go.sum
+++ b/service/redshift/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/redshift/go_module_metadata.go b/service/redshift/go_module_metadata.go
index 5a797886dfb..6c05af583a8 100644
--- a/service/redshift/go_module_metadata.go
+++ b/service/redshift/go_module_metadata.go
@@ -3,4 +3,4 @@
 package redshift
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.53.9"
+const goModuleVersion = "1.53.10"
diff --git a/service/redshiftdata/CHANGELOG.md b/service/redshiftdata/CHANGELOG.md
index 8d0b54c2d68..8cb58843a50 100644
--- a/service/redshiftdata/CHANGELOG.md
+++ b/service/redshiftdata/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/redshiftdata/go.mod b/service/redshiftdata/go.mod
index 95f621df3e4..f4f12f00c80 100644
--- a/service/redshiftdata/go.mod
+++ b/service/redshiftdata/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/redshiftdata
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/redshiftdata/go_module_metadata.go b/service/redshiftdata/go_module_metadata.go
index 32f7e2539be..4a1b22743a7 100644
--- a/service/redshiftdata/go_module_metadata.go
+++ b/service/redshiftdata/go_module_metadata.go
@@ -3,4 +3,4 @@
 package redshiftdata
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.10"
+const goModuleVersion = "1.31.11"
diff --git a/service/redshiftserverless/CHANGELOG.md b/service/redshiftserverless/CHANGELOG.md
index e6c730ecd3c..18befc49761 100644
--- a/service/redshiftserverless/CHANGELOG.md
+++ b/service/redshiftserverless/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/redshiftserverless/go.mod b/service/redshiftserverless/go.mod
index 61fbce515c3..cd63333cdb9 100644
--- a/service/redshiftserverless/go.mod
+++ b/service/redshiftserverless/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/redshiftserverless
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/redshiftserverless/go_module_metadata.go b/service/redshiftserverless/go_module_metadata.go
index ce7d19e034d..0908053a6c2 100644
--- a/service/redshiftserverless/go_module_metadata.go
+++ b/service/redshiftserverless/go_module_metadata.go
@@ -3,4 +3,4 @@
 package redshiftserverless
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.6"
+const goModuleVersion = "1.25.7"
diff --git a/service/rekognition/CHANGELOG.md b/service/rekognition/CHANGELOG.md
index fcd8d16d7ca..942d89df0f8 100644
--- a/service/rekognition/CHANGELOG.md
+++ b/service/rekognition/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.45.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.45.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rekognition/api_op_DescribeProjectVersions.go b/service/rekognition/api_op_DescribeProjectVersions.go
index 2d4fdeb1c0c..f889f6242a8 100644
--- a/service/rekognition/api_op_DescribeProjectVersions.go
+++ b/service/rekognition/api_op_DescribeProjectVersions.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -346,29 +345,18 @@ func (w *ProjectVersionRunningWaiter) WaitForOutput(ctx context.Context, params
 func projectVersionRunningStateRetryable(ctx context.Context, input *DescribeProjectVersionsInput, output *DescribeProjectVersionsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProjectVersionDescriptions[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProjectVersionDescriptions
+		var v2 []types.ProjectVersionStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "RUNNING"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.ProjectVersionStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -378,26 +366,23 @@ func projectVersionRunningStateRetryable(ctx context.Context, input *DescribePro
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProjectVersionDescriptions[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProjectVersionDescriptions
+		var v2 []types.ProjectVersionStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.ProjectVersionStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
@@ -572,29 +557,18 @@ func (w *ProjectVersionTrainingCompletedWaiter) WaitForOutput(ctx context.Contex
 func projectVersionTrainingCompletedStateRetryable(ctx context.Context, input *DescribeProjectVersionsInput, output *DescribeProjectVersionsOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProjectVersionDescriptions[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProjectVersionDescriptions
+		var v2 []types.ProjectVersionStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "TRAINING_COMPLETED"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(types.ProjectVersionStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
@@ -604,26 +578,23 @@ func projectVersionTrainingCompletedStateRetryable(ctx context.Context, input *D
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProjectVersionDescriptions[].Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ProjectVersionDescriptions
+		var v2 []types.ProjectVersionStatus
+		for _, v := range v1 {
+			v3 := v.Status
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "TRAINING_FAILED"
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		for _, v := range listOfValues {
-			value, ok := v.(types.ProjectVersionStatus)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected types.ProjectVersionStatus value, got %T", pathValue)
+		var match bool
+		for _, v := range v2 {
+			if string(v) == expectedValue {
+				match = true
+				break
 			}
+		}
 
-			if string(value) == expectedValue {
-				return false, fmt.Errorf("waiter state transitioned to Failure")
-			}
+		if match {
+			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
diff --git a/service/rekognition/generated.json b/service/rekognition/generated.json
index 4f7136ee09c..bf867c41b4e 100644
--- a/service/rekognition/generated.json
+++ b/service/rekognition/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/rekognition/go.mod b/service/rekognition/go.mod
index df57ab3de2a..f9634fd0588 100644
--- a/service/rekognition/go.mod
+++ b/service/rekognition/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/rekognition
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/rekognition/go.sum b/service/rekognition/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/rekognition/go.sum
+++ b/service/rekognition/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/rekognition/go_module_metadata.go b/service/rekognition/go_module_metadata.go
index 51c7a4cf54c..03f5c825dc1 100644
--- a/service/rekognition/go_module_metadata.go
+++ b/service/rekognition/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rekognition
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.45.15"
+const goModuleVersion = "1.45.16"
diff --git a/service/repostspace/CHANGELOG.md b/service/repostspace/CHANGELOG.md
index 2e573d07785..0229aa5ee00 100644
--- a/service/repostspace/CHANGELOG.md
+++ b/service/repostspace/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/repostspace/go.mod b/service/repostspace/go.mod
index 89ab668c64b..36add2fda78 100644
--- a/service/repostspace/go.mod
+++ b/service/repostspace/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/repostspace
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/repostspace/go_module_metadata.go b/service/repostspace/go_module_metadata.go
index 4222f80161a..5da7639c671 100644
--- a/service/repostspace/go_module_metadata.go
+++ b/service/repostspace/go_module_metadata.go
@@ -3,4 +3,4 @@
 package repostspace
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.11"
+const goModuleVersion = "1.8.12"
diff --git a/service/resiliencehub/CHANGELOG.md b/service/resiliencehub/CHANGELOG.md
index 226806a2b2e..bccaca7e35a 100644
--- a/service/resiliencehub/CHANGELOG.md
+++ b/service/resiliencehub/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/resiliencehub/go.mod b/service/resiliencehub/go.mod
index c6929ef7a9f..6ba847335fc 100644
--- a/service/resiliencehub/go.mod
+++ b/service/resiliencehub/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/resiliencehub
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/resiliencehub/go_module_metadata.go b/service/resiliencehub/go_module_metadata.go
index 47856ab9d03..22efde7c17d 100644
--- a/service/resiliencehub/go_module_metadata.go
+++ b/service/resiliencehub/go_module_metadata.go
@@ -3,4 +3,4 @@
 package resiliencehub
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.7"
+const goModuleVersion = "1.29.8"
diff --git a/service/resourceexplorer2/CHANGELOG.md b/service/resourceexplorer2/CHANGELOG.md
index 524ad68eee6..ef0e3c475d5 100644
--- a/service/resourceexplorer2/CHANGELOG.md
+++ b/service/resourceexplorer2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/resourceexplorer2/go.mod b/service/resourceexplorer2/go.mod
index 7349dbdc5a7..772badfb480 100644
--- a/service/resourceexplorer2/go.mod
+++ b/service/resourceexplorer2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/resourceexplorer2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/resourceexplorer2/go_module_metadata.go b/service/resourceexplorer2/go_module_metadata.go
index 699003104ff..e146e1b2776 100644
--- a/service/resourceexplorer2/go_module_metadata.go
+++ b/service/resourceexplorer2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package resourceexplorer2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.8"
+const goModuleVersion = "1.16.9"
diff --git a/service/resourcegroups/CHANGELOG.md b/service/resourcegroups/CHANGELOG.md
index ea15163fc89..34ec15cd6ff 100644
--- a/service/resourcegroups/CHANGELOG.md
+++ b/service/resourcegroups/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/resourcegroups/go.mod b/service/resourcegroups/go.mod
index edaa981d46f..00b947fe5cb 100644
--- a/service/resourcegroups/go.mod
+++ b/service/resourcegroups/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/resourcegroups
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/resourcegroups/go_module_metadata.go b/service/resourcegroups/go_module_metadata.go
index e740206bc41..951778cb5dd 100644
--- a/service/resourcegroups/go_module_metadata.go
+++ b/service/resourcegroups/go_module_metadata.go
@@ -3,4 +3,4 @@
 package resourcegroups
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.15"
+const goModuleVersion = "1.27.16"
diff --git a/service/resourcegroupstaggingapi/CHANGELOG.md b/service/resourcegroupstaggingapi/CHANGELOG.md
index 7f8446a6aac..5acf222be02 100644
--- a/service/resourcegroupstaggingapi/CHANGELOG.md
+++ b/service/resourcegroupstaggingapi/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/resourcegroupstaggingapi/go.mod b/service/resourcegroupstaggingapi/go.mod
index 756747febd9..5a8e770fdd4 100644
--- a/service/resourcegroupstaggingapi/go.mod
+++ b/service/resourcegroupstaggingapi/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/resourcegroupstaggingapi/go_module_metadata.go b/service/resourcegroupstaggingapi/go_module_metadata.go
index 7c5736f58c1..caddffa1294 100644
--- a/service/resourcegroupstaggingapi/go_module_metadata.go
+++ b/service/resourcegroupstaggingapi/go_module_metadata.go
@@ -3,4 +3,4 @@
 package resourcegroupstaggingapi
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.15"
+const goModuleVersion = "1.25.16"
diff --git a/service/robomaker/CHANGELOG.md b/service/robomaker/CHANGELOG.md
index 59024cc84b7..6edb276ff07 100644
--- a/service/robomaker/CHANGELOG.md
+++ b/service/robomaker/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/robomaker/go.mod b/service/robomaker/go.mod
index 948d141e08a..efb64d2d743 100644
--- a/service/robomaker/go.mod
+++ b/service/robomaker/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/robomaker
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/robomaker/go_module_metadata.go b/service/robomaker/go_module_metadata.go
index b60790c3dc1..115d5e4dcbb 100644
--- a/service/robomaker/go_module_metadata.go
+++ b/service/robomaker/go_module_metadata.go
@@ -3,4 +3,4 @@
 package robomaker
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.14"
+const goModuleVersion = "1.30.15"
diff --git a/service/rolesanywhere/CHANGELOG.md b/service/rolesanywhere/CHANGELOG.md
index 3979014b47c..ab96d47c61a 100644
--- a/service/rolesanywhere/CHANGELOG.md
+++ b/service/rolesanywhere/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.16.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.16.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rolesanywhere/go.mod b/service/rolesanywhere/go.mod
index 3c2db554ecc..190b63ad8ea 100644
--- a/service/rolesanywhere/go.mod
+++ b/service/rolesanywhere/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/rolesanywhere
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/rolesanywhere/go_module_metadata.go b/service/rolesanywhere/go_module_metadata.go
index e97041c2ecf..2bec1f75f58 100644
--- a/service/rolesanywhere/go_module_metadata.go
+++ b/service/rolesanywhere/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rolesanywhere
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.16.13"
+const goModuleVersion = "1.16.14"
diff --git a/service/route53/CHANGELOG.md b/service/route53/CHANGELOG.md
index c400f5b3cc7..55e8dc628fa 100644
--- a/service/route53/CHANGELOG.md
+++ b/service/route53/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.48.5 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.48.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53/api_op_GetChange.go b/service/route53/api_op_GetChange.go
index fd7c3f60aad..f484336ac5d 100644
--- a/service/route53/api_op_GetChange.go
+++ b/service/route53/api_op_GetChange.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -332,18 +331,16 @@ func (w *ResourceRecordSetsChangedWaiter) WaitForOutput(ctx context.Context, par
 func resourceRecordSetsChangedStateRetryable(ctx context.Context, input *GetChangeInput, output *GetChangeOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ChangeInfo.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ChangeInfo
+		var v2 types.ChangeStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "INSYNC"
-		value, ok := pathValue.(types.ChangeStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ChangeStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
diff --git a/service/route53/generated.json b/service/route53/generated.json
index c0507f4d9a9..5f9debaed58 100644
--- a/service/route53/generated.json
+++ b/service/route53/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/route53/go.mod b/service/route53/go.mod
index 7a8d4e251b8..42577fa0bd6 100644
--- a/service/route53/go.mod
+++ b/service/route53/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/route53
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/route53/go.sum b/service/route53/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/route53/go.sum
+++ b/service/route53/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/route53/go_module_metadata.go b/service/route53/go_module_metadata.go
index e2903909c69..99b2c009ea0 100644
--- a/service/route53/go_module_metadata.go
+++ b/service/route53/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.48.4"
+const goModuleVersion = "1.48.5"
diff --git a/service/route53domains/CHANGELOG.md b/service/route53domains/CHANGELOG.md
index c8541738833..b7240785024 100644
--- a/service/route53domains/CHANGELOG.md
+++ b/service/route53domains/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53domains/go.mod b/service/route53domains/go.mod
index aa354b0f1a5..d2b212cc1ae 100644
--- a/service/route53domains/go.mod
+++ b/service/route53domains/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/route53domains
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/route53domains/go_module_metadata.go b/service/route53domains/go_module_metadata.go
index 2ffb2861a84..59d94772c52 100644
--- a/service/route53domains/go_module_metadata.go
+++ b/service/route53domains/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53domains
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.7"
+const goModuleVersion = "1.28.8"
diff --git a/service/route53profiles/CHANGELOG.md b/service/route53profiles/CHANGELOG.md
index 1af634ad6c5..b2dd82741b0 100644
--- a/service/route53profiles/CHANGELOG.md
+++ b/service/route53profiles/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.4.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.4.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53profiles/go.mod b/service/route53profiles/go.mod
index 8bfae13e895..f3885dd8345 100644
--- a/service/route53profiles/go.mod
+++ b/service/route53profiles/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/route53profiles
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/route53profiles/go_module_metadata.go b/service/route53profiles/go_module_metadata.go
index 9b7fe39a9c5..a660fa30071 100644
--- a/service/route53profiles/go_module_metadata.go
+++ b/service/route53profiles/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53profiles
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.4.13"
+const goModuleVersion = "1.4.14"
diff --git a/service/route53recoverycluster/CHANGELOG.md b/service/route53recoverycluster/CHANGELOG.md
index 46773926db9..132130895cf 100644
--- a/service/route53recoverycluster/CHANGELOG.md
+++ b/service/route53recoverycluster/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53recoverycluster/go.mod b/service/route53recoverycluster/go.mod
index 75de979bb7e..126f0afe2f4 100644
--- a/service/route53recoverycluster/go.mod
+++ b/service/route53recoverycluster/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/route53recoverycluster
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/route53recoverycluster/go_module_metadata.go b/service/route53recoverycluster/go_module_metadata.go
index 6cc4317e8ae..d1fb6c28751 100644
--- a/service/route53recoverycluster/go_module_metadata.go
+++ b/service/route53recoverycluster/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53recoverycluster
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/route53recoverycontrolconfig/CHANGELOG.md b/service/route53recoverycontrolconfig/CHANGELOG.md
index a10e4cc9c97..cc9455ad13a 100644
--- a/service/route53recoverycontrolconfig/CHANGELOG.md
+++ b/service/route53recoverycontrolconfig/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.25.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53recoverycontrolconfig/api_op_DescribeCluster.go b/service/route53recoverycontrolconfig/api_op_DescribeCluster.go
index f9a9b8d4a31..2c3caf9590a 100644
--- a/service/route53recoverycontrolconfig/api_op_DescribeCluster.go
+++ b/service/route53recoverycontrolconfig/api_op_DescribeCluster.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -314,35 +313,31 @@ func (w *ClusterCreatedWaiter) WaitForOutput(ctx context.Context, params *Descri
 func clusterCreatedStateRetryable(ctx context.Context, input *DescribeClusterInput, output *DescribeClusterOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYED"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -527,18 +522,16 @@ func clusterDeletedStateRetryable(ctx context.Context, input *DescribeClusterInp
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Cluster.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Cluster
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING_DELETION"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/route53recoverycontrolconfig/api_op_DescribeControlPanel.go b/service/route53recoverycontrolconfig/api_op_DescribeControlPanel.go
index 5802aa11cce..22b760e486e 100644
--- a/service/route53recoverycontrolconfig/api_op_DescribeControlPanel.go
+++ b/service/route53recoverycontrolconfig/api_op_DescribeControlPanel.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -315,35 +314,31 @@ func (w *ControlPanelCreatedWaiter) WaitForOutput(ctx context.Context, params *D
 func controlPanelCreatedStateRetryable(ctx context.Context, input *DescribeControlPanelInput, output *DescribeControlPanelOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ControlPanel.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ControlPanel
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYED"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ControlPanel.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ControlPanel
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -530,18 +525,16 @@ func controlPanelDeletedStateRetryable(ctx context.Context, input *DescribeContr
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ControlPanel.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ControlPanel
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING_DELETION"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/route53recoverycontrolconfig/api_op_DescribeRoutingControl.go b/service/route53recoverycontrolconfig/api_op_DescribeRoutingControl.go
index 17778a724d1..9bc713d2635 100644
--- a/service/route53recoverycontrolconfig/api_op_DescribeRoutingControl.go
+++ b/service/route53recoverycontrolconfig/api_op_DescribeRoutingControl.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -320,35 +319,31 @@ func (w *RoutingControlCreatedWaiter) WaitForOutput(ctx context.Context, params
 func routingControlCreatedStateRetryable(ctx context.Context, input *DescribeRoutingControlInput, output *DescribeRoutingControlOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RoutingControl.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RoutingControl
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DEPLOYED"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RoutingControl.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RoutingControl
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
@@ -535,18 +530,16 @@ func routingControlDeletedStateRetryable(ctx context.Context, input *DescribeRou
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("RoutingControl.Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.RoutingControl
+		var v2 types.Status
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "PENDING_DELETION"
-		value, ok := pathValue.(types.Status)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.Status value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
diff --git a/service/route53recoverycontrolconfig/generated.json b/service/route53recoverycontrolconfig/generated.json
index cbd907f2c6c..15daa2420de 100644
--- a/service/route53recoverycontrolconfig/generated.json
+++ b/service/route53recoverycontrolconfig/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/route53recoverycontrolconfig/go.mod b/service/route53recoverycontrolconfig/go.mod
index 2240cacb7ba..ba596067056 100644
--- a/service/route53recoverycontrolconfig/go.mod
+++ b/service/route53recoverycontrolconfig/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/route53recoverycontrolconfig/go.sum b/service/route53recoverycontrolconfig/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/route53recoverycontrolconfig/go.sum
+++ b/service/route53recoverycontrolconfig/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/route53recoverycontrolconfig/go_module_metadata.go b/service/route53recoverycontrolconfig/go_module_metadata.go
index 959f6cc335a..93d83dd5eeb 100644
--- a/service/route53recoverycontrolconfig/go_module_metadata.go
+++ b/service/route53recoverycontrolconfig/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53recoverycontrolconfig
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.14"
+const goModuleVersion = "1.25.15"
diff --git a/service/route53recoveryreadiness/CHANGELOG.md b/service/route53recoveryreadiness/CHANGELOG.md
index fdd199055c0..7c2b93eaef2 100644
--- a/service/route53recoveryreadiness/CHANGELOG.md
+++ b/service/route53recoveryreadiness/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53recoveryreadiness/go.mod b/service/route53recoveryreadiness/go.mod
index 9b4564ccefc..c7b515c368f 100644
--- a/service/route53recoveryreadiness/go.mod
+++ b/service/route53recoveryreadiness/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/route53recoveryreadiness/go_module_metadata.go b/service/route53recoveryreadiness/go_module_metadata.go
index 6ab46506f9a..f74a4a3753f 100644
--- a/service/route53recoveryreadiness/go_module_metadata.go
+++ b/service/route53recoveryreadiness/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53recoveryreadiness
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.13"
+const goModuleVersion = "1.21.14"
diff --git a/service/route53resolver/CHANGELOG.md b/service/route53resolver/CHANGELOG.md
index 3532b54e74f..316cc4961cb 100644
--- a/service/route53resolver/CHANGELOG.md
+++ b/service/route53resolver/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/route53resolver/go.mod b/service/route53resolver/go.mod
index 68d3dea4cce..5f3a7f9b7f4 100644
--- a/service/route53resolver/go.mod
+++ b/service/route53resolver/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/route53resolver
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/route53resolver/go_module_metadata.go b/service/route53resolver/go_module_metadata.go
index 884be09972a..b0140c1c776 100644
--- a/service/route53resolver/go_module_metadata.go
+++ b/service/route53resolver/go_module_metadata.go
@@ -3,4 +3,4 @@
 package route53resolver
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.10"
+const goModuleVersion = "1.34.11"
diff --git a/service/rum/CHANGELOG.md b/service/rum/CHANGELOG.md
index afd5f53d347..8fb81934db4 100644
--- a/service/rum/CHANGELOG.md
+++ b/service/rum/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/rum/go.mod b/service/rum/go.mod
index 8baf73c8a84..72704465424 100644
--- a/service/rum/go.mod
+++ b/service/rum/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/rum
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/rum/go_module_metadata.go b/service/rum/go_module_metadata.go
index 8a96343ad3e..468de8bd933 100644
--- a/service/rum/go_module_metadata.go
+++ b/service/rum/go_module_metadata.go
@@ -3,4 +3,4 @@
 package rum
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.13"
+const goModuleVersion = "1.21.14"
diff --git a/service/s3/CHANGELOG.md b/service/s3/CHANGELOG.md
index 9ac48c65f62..e411d3f25c2 100644
--- a/service/s3/CHANGELOG.md
+++ b/service/s3/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.75.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.75.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/s3/go.mod b/service/s3/go.mod
index e01de89fe3d..9064bf08b1d 100644
--- a/service/s3/go.mod
+++ b/service/s3/go.mod
@@ -3,15 +3,15 @@ module github.com/aws/aws-sdk-go-v2/service/s3
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.4
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.5
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/s3/go_module_metadata.go b/service/s3/go_module_metadata.go
index e200311944e..85cb7c86f06 100644
--- a/service/s3/go_module_metadata.go
+++ b/service/s3/go_module_metadata.go
@@ -3,4 +3,4 @@
 package s3
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.75.1"
+const goModuleVersion = "1.75.2"
diff --git a/service/s3/internal/configtesting/go.mod b/service/s3/internal/configtesting/go.mod
index 92bd0d42c3b..046b1f3d502 100644
--- a/service/s3/internal/configtesting/go.mod
+++ b/service/s3/internal/configtesting/go.mod
@@ -3,22 +3,22 @@ module github.com/aws/aws-sdk-go-v2/service/s3/internal/configtesting
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2/config v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11
+	github.com/aws/aws-sdk-go-v2/config v1.29.4
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.12 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
 )
 
diff --git a/service/s3control/CHANGELOG.md b/service/s3control/CHANGELOG.md
index a5dc8fe8b9f..4038bbfabe4 100644
--- a/service/s3control/CHANGELOG.md
+++ b/service/s3control/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.53.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.53.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/s3control/go.mod b/service/s3control/go.mod
index 2b39fe1a8c4..ba5701c0f4f 100644
--- a/service/s3control/go.mod
+++ b/service/s3control/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/s3control
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.11
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/s3control/go_module_metadata.go b/service/s3control/go_module_metadata.go
index 0308bbf3722..d7dd8863476 100644
--- a/service/s3control/go_module_metadata.go
+++ b/service/s3control/go_module_metadata.go
@@ -3,4 +3,4 @@
 package s3control
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.53.1"
+const goModuleVersion = "1.53.2"
diff --git a/service/s3outposts/CHANGELOG.md b/service/s3outposts/CHANGELOG.md
index 31758ae0f11..6d4c5f455b3 100644
--- a/service/s3outposts/CHANGELOG.md
+++ b/service/s3outposts/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/s3outposts/go.mod b/service/s3outposts/go.mod
index 6cc6331b043..7227121d170 100644
--- a/service/s3outposts/go.mod
+++ b/service/s3outposts/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/s3outposts
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/s3outposts/go_module_metadata.go b/service/s3outposts/go_module_metadata.go
index c5d43e26158..38c58df150b 100644
--- a/service/s3outposts/go_module_metadata.go
+++ b/service/s3outposts/go_module_metadata.go
@@ -3,4 +3,4 @@
 package s3outposts
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/s3tables/CHANGELOG.md b/service/s3tables/CHANGELOG.md
index 22854a22123..2ab6caa38b8 100644
--- a/service/s3tables/CHANGELOG.md
+++ b/service/s3tables/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.1 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.0 (2025-01-30)
 
 * **Feature**: You can now use the CreateTable API operation to create tables with schemas by adding an optional metadata argument.
diff --git a/service/s3tables/go.mod b/service/s3tables/go.mod
index 15ff05c56fb..1d5d7115152 100644
--- a/service/s3tables/go.mod
+++ b/service/s3tables/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/s3tables
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/s3tables/go_module_metadata.go b/service/s3tables/go_module_metadata.go
index db2f4fef4bb..cc89326f370 100644
--- a/service/s3tables/go_module_metadata.go
+++ b/service/s3tables/go_module_metadata.go
@@ -3,4 +3,4 @@
 package s3tables
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.0"
+const goModuleVersion = "1.1.1"
diff --git a/service/sagemaker/CHANGELOG.md b/service/sagemaker/CHANGELOG.md
index f4d572548a3..63fc7517fdf 100644
--- a/service/sagemaker/CHANGELOG.md
+++ b/service/sagemaker/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.174.0 (2025-01-31)
+
+* **Feature**: This release introduces a new valid value in InstanceType parameter: p5en.48xlarge, in ProductionVariant.
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.173.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemaker/api_op_DescribeEndpoint.go b/service/sagemaker/api_op_DescribeEndpoint.go
index 00b535ef695..db0c34a99eb 100644
--- a/service/sagemaker/api_op_DescribeEndpoint.go
+++ b/service/sagemaker/api_op_DescribeEndpoint.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -423,18 +422,11 @@ func endpointDeletedStateRetryable(ctx context.Context, input *DescribeEndpointI
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("EndpointStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.EndpointStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.EndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.EndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -605,35 +597,21 @@ func (w *EndpointInServiceWaiter) WaitForOutput(ctx context.Context, params *Des
 func endpointInServiceStateRetryable(ctx context.Context, input *DescribeEndpointInput, output *DescribeEndpointOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("EndpointStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.EndpointStatus
 		expectedValue := "InService"
-		value, ok := pathValue.(types.EndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.EndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("EndpointStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.EndpointStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.EndpointStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.EndpointStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeImage.go b/service/sagemaker/api_op_DescribeImage.go
index 37d6acd0144..1716aa60508 100644
--- a/service/sagemaker/api_op_DescribeImage.go
+++ b/service/sagemaker/api_op_DescribeImage.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -338,35 +337,21 @@ func (w *ImageCreatedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func imageCreatedStateRetryable(ctx context.Context, input *DescribeImageInput, output *DescribeImageOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageStatus
 		expectedValue := "CREATED"
-		value, ok := pathValue.(types.ImageStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageStatus
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.ImageStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -560,18 +545,11 @@ func imageDeletedStateRetryable(ctx context.Context, input *DescribeImageInput,
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageStatus
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.ImageStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -753,35 +731,21 @@ func (w *ImageUpdatedWaiter) WaitForOutput(ctx context.Context, params *Describe
 func imageUpdatedStateRetryable(ctx context.Context, input *DescribeImageInput, output *DescribeImageOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageStatus
 		expectedValue := "CREATED"
-		value, ok := pathValue.(types.ImageStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageStatus
 		expectedValue := "UPDATE_FAILED"
-		value, ok := pathValue.(types.ImageStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeImageVersion.go b/service/sagemaker/api_op_DescribeImageVersion.go
index c4919eb92a3..64078a324c7 100644
--- a/service/sagemaker/api_op_DescribeImageVersion.go
+++ b/service/sagemaker/api_op_DescribeImageVersion.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -390,35 +389,21 @@ func (w *ImageVersionCreatedWaiter) WaitForOutput(ctx context.Context, params *D
 func imageVersionCreatedStateRetryable(ctx context.Context, input *DescribeImageVersionInput, output *DescribeImageVersionOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageVersionStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageVersionStatus
 		expectedValue := "CREATED"
-		value, ok := pathValue.(types.ImageVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageVersionStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageVersionStatus
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.ImageVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -615,18 +600,11 @@ func imageVersionDeletedStateRetryable(ctx context.Context, input *DescribeImage
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ImageVersionStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ImageVersionStatus
 		expectedValue := "DELETE_FAILED"
-		value, ok := pathValue.(types.ImageVersionStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ImageVersionStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeNotebookInstance.go b/service/sagemaker/api_op_DescribeNotebookInstance.go
index cb31bfb2913..843f2e09ae7 100644
--- a/service/sagemaker/api_op_DescribeNotebookInstance.go
+++ b/service/sagemaker/api_op_DescribeNotebookInstance.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -429,18 +428,11 @@ func notebookInstanceDeletedStateRetryable(ctx context.Context, input *DescribeN
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NotebookInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NotebookInstanceStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.NotebookInstanceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -614,35 +606,21 @@ func (w *NotebookInstanceInServiceWaiter) WaitForOutput(ctx context.Context, par
 func notebookInstanceInServiceStateRetryable(ctx context.Context, input *DescribeNotebookInstanceInput, output *DescribeNotebookInstanceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NotebookInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NotebookInstanceStatus
 		expectedValue := "InService"
-		value, ok := pathValue.(types.NotebookInstanceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NotebookInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NotebookInstanceStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.NotebookInstanceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -815,35 +793,21 @@ func (w *NotebookInstanceStoppedWaiter) WaitForOutput(ctx context.Context, param
 func notebookInstanceStoppedStateRetryable(ctx context.Context, input *DescribeNotebookInstanceInput, output *DescribeNotebookInstanceOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NotebookInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NotebookInstanceStatus
 		expectedValue := "Stopped"
-		value, ok := pathValue.(types.NotebookInstanceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("NotebookInstanceStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.NotebookInstanceStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.NotebookInstanceStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.NotebookInstanceStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeProcessingJob.go b/service/sagemaker/api_op_DescribeProcessingJob.go
index b4d7c3efff4..0f4de310715 100644
--- a/service/sagemaker/api_op_DescribeProcessingJob.go
+++ b/service/sagemaker/api_op_DescribeProcessingJob.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -399,52 +398,31 @@ func (w *ProcessingJobCompletedOrStoppedWaiter) WaitForOutput(ctx context.Contex
 func processingJobCompletedOrStoppedStateRetryable(ctx context.Context, input *DescribeProcessingJobInput, output *DescribeProcessingJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProcessingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ProcessingJobStatus
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.ProcessingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ProcessingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProcessingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ProcessingJobStatus
 		expectedValue := "Stopped"
-		value, ok := pathValue.(types.ProcessingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ProcessingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("ProcessingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.ProcessingJobStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.ProcessingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ProcessingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeTrainingJob.go b/service/sagemaker/api_op_DescribeTrainingJob.go
index a22fd49c345..f5a68015f38 100644
--- a/service/sagemaker/api_op_DescribeTrainingJob.go
+++ b/service/sagemaker/api_op_DescribeTrainingJob.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -610,52 +609,31 @@ func (w *TrainingJobCompletedOrStoppedWaiter) WaitForOutput(ctx context.Context,
 func trainingJobCompletedOrStoppedStateRetryable(ctx context.Context, input *DescribeTrainingJobInput, output *DescribeTrainingJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TrainingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TrainingJobStatus
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.TrainingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TrainingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TrainingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TrainingJobStatus
 		expectedValue := "Stopped"
-		value, ok := pathValue.(types.TrainingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TrainingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TrainingJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TrainingJobStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.TrainingJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TrainingJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/api_op_DescribeTransformJob.go b/service/sagemaker/api_op_DescribeTransformJob.go
index fc1081c787b..39e0f6003cd 100644
--- a/service/sagemaker/api_op_DescribeTransformJob.go
+++ b/service/sagemaker/api_op_DescribeTransformJob.go
@@ -13,7 +13,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -432,52 +431,31 @@ func (w *TransformJobCompletedOrStoppedWaiter) WaitForOutput(ctx context.Context
 func transformJobCompletedOrStoppedStateRetryable(ctx context.Context, input *DescribeTransformJobInput, output *DescribeTransformJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TransformJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TransformJobStatus
 		expectedValue := "Completed"
-		value, ok := pathValue.(types.TransformJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TransformJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TransformJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TransformJobStatus
 		expectedValue := "Stopped"
-		value, ok := pathValue.(types.TransformJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TransformJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("TransformJobStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.TransformJobStatus
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.TransformJobStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.TransformJobStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/sagemaker/generated.json b/service/sagemaker/generated.json
index 2edb0bf7645..4a832a03763 100644
--- a/service/sagemaker/generated.json
+++ b/service/sagemaker/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/sagemaker/go.mod b/service/sagemaker/go.mod
index 8fef119d7f6..2b4573f580e 100644
--- a/service/sagemaker/go.mod
+++ b/service/sagemaker/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/sagemaker
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/sagemaker/go.sum b/service/sagemaker/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/sagemaker/go.sum
+++ b/service/sagemaker/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/sagemaker/go_module_metadata.go b/service/sagemaker/go_module_metadata.go
index e18c54b5fbc..67b27838246 100644
--- a/service/sagemaker/go_module_metadata.go
+++ b/service/sagemaker/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemaker
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.173.3"
+const goModuleVersion = "1.174.0"
diff --git a/service/sagemaker/types/enums.go b/service/sagemaker/types/enums.go
index c1c7c52a878..63d52f8530f 100644
--- a/service/sagemaker/types/enums.go
+++ b/service/sagemaker/types/enums.go
@@ -5843,6 +5843,7 @@ const (
 	ProductionVariantInstanceTypeMlInf248xlarge  ProductionVariantInstanceType = "ml.inf2.48xlarge"
 	ProductionVariantInstanceTypeMlP548xlarge    ProductionVariantInstanceType = "ml.p5.48xlarge"
 	ProductionVariantInstanceTypeMlP5e48xlarge   ProductionVariantInstanceType = "ml.p5e.48xlarge"
+	ProductionVariantInstanceTypeMlP5en48xlarge  ProductionVariantInstanceType = "ml.p5en.48xlarge"
 	ProductionVariantInstanceTypeMlM7iLarge      ProductionVariantInstanceType = "ml.m7i.large"
 	ProductionVariantInstanceTypeMlM7iXlarge     ProductionVariantInstanceType = "ml.m7i.xlarge"
 	ProductionVariantInstanceTypeMlM7i2xlarge    ProductionVariantInstanceType = "ml.m7i.2xlarge"
@@ -6065,6 +6066,7 @@ func (ProductionVariantInstanceType) Values() []ProductionVariantInstanceType {
 		"ml.inf2.48xlarge",
 		"ml.p5.48xlarge",
 		"ml.p5e.48xlarge",
+		"ml.p5en.48xlarge",
 		"ml.m7i.large",
 		"ml.m7i.xlarge",
 		"ml.m7i.2xlarge",
diff --git a/service/sagemaker/types/types.go b/service/sagemaker/types/types.go
index 0d1155f395e..118061c6028 100644
--- a/service/sagemaker/types/types.go
+++ b/service/sagemaker/types/types.go
@@ -1220,6 +1220,12 @@ type AppDetails struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	ResourceSpec *ResourceSpec
 
 	// The name of the space.
@@ -3696,6 +3702,12 @@ type CodeEditorAppSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	// The Amazon Resource Name (ARN) of the Code Editor application lifecycle
@@ -9964,6 +9976,12 @@ type JupyterLabAppSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	// The configuration parameters that specify the IAM roles assumed by the
@@ -16203,6 +16221,12 @@ type ResourceSharingConfig struct {
 
 // Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 // the instance type that the version runs on.
+//
+// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+// because SageMakerImageVersionArn always takes precedence. To clear the value
+// set for SageMakerImageVersionArn , pass None as the value.
 type ResourceSpec struct {
 
 	// The instance type that the image version runs on.
@@ -16224,7 +16248,8 @@ type ResourceSpec struct {
 	// SemVer 2.0.0 versioning format.
 	SageMakerImageVersionAlias *string
 
-	// The ARN of the image version created on the instance.
+	// The ARN of the image version created on the instance. To clear the value set
+	// for SageMakerImageVersionArn , pass None as the value.
 	SageMakerImageVersionArn *string
 
 	noSmithyDocumentSerde
@@ -16296,6 +16321,12 @@ type RSessionAppSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	noSmithyDocumentSerde
@@ -16326,6 +16357,12 @@ type RStudioServerProDomainSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	// A URL pointing to an RStudio Connect server.
@@ -16348,6 +16385,12 @@ type RStudioServerProDomainSettingsForUpdate struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	// A URL pointing to an RStudio Connect server.
@@ -17249,6 +17292,12 @@ type SpaceCodeEditorAppSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	noSmithyDocumentSerde
@@ -17310,6 +17359,12 @@ type SpaceJupyterLabAppSettings struct {
 
 	// Specifies the ARN's of a SageMaker AI image and SageMaker AI image version, and
 	// the instance type that the version runs on.
+	//
+	// When both SageMakerImageVersionArn and SageMakerImageArn are passed,
+	// SageMakerImageVersionArn is used. Any updates to SageMakerImageArn will not
+	// take effect if SageMakerImageVersionArn already exists in the ResourceSpec
+	// because SageMakerImageVersionArn always takes precedence. To clear the value
+	// set for SageMakerImageVersionArn , pass None as the value.
 	DefaultResourceSpec *ResourceSpec
 
 	noSmithyDocumentSerde
diff --git a/service/sagemakera2iruntime/CHANGELOG.md b/service/sagemakera2iruntime/CHANGELOG.md
index 9a767630599..0517eb4c307 100644
--- a/service/sagemakera2iruntime/CHANGELOG.md
+++ b/service/sagemakera2iruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakera2iruntime/go.mod b/service/sagemakera2iruntime/go.mod
index 4ed68cc9172..15b10319b49 100644
--- a/service/sagemakera2iruntime/go.mod
+++ b/service/sagemakera2iruntime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakera2iruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakera2iruntime/go_module_metadata.go b/service/sagemakera2iruntime/go_module_metadata.go
index cec554cc3a2..bbc4660d399 100644
--- a/service/sagemakera2iruntime/go_module_metadata.go
+++ b/service/sagemakera2iruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakera2iruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.13"
+const goModuleVersion = "1.27.14"
diff --git a/service/sagemakeredge/CHANGELOG.md b/service/sagemakeredge/CHANGELOG.md
index 9f4b50ef839..7a1eaaa2f5e 100644
--- a/service/sagemakeredge/CHANGELOG.md
+++ b/service/sagemakeredge/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakeredge/go.mod b/service/sagemakeredge/go.mod
index cbd1cdcb01f..c645818d8d3 100644
--- a/service/sagemakeredge/go.mod
+++ b/service/sagemakeredge/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakeredge
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakeredge/go_module_metadata.go b/service/sagemakeredge/go_module_metadata.go
index f8d99172c4e..4bcff733486 100644
--- a/service/sagemakeredge/go_module_metadata.go
+++ b/service/sagemakeredge/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakeredge
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/sagemakerfeaturestoreruntime/CHANGELOG.md b/service/sagemakerfeaturestoreruntime/CHANGELOG.md
index 8b6fde369d7..11a3a205919 100644
--- a/service/sagemakerfeaturestoreruntime/CHANGELOG.md
+++ b/service/sagemakerfeaturestoreruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakerfeaturestoreruntime/go.mod b/service/sagemakerfeaturestoreruntime/go.mod
index e2ee6318f28..1fca82d262d 100644
--- a/service/sagemakerfeaturestoreruntime/go.mod
+++ b/service/sagemakerfeaturestoreruntime/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakerfeaturestoreruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakerfeaturestoreruntime/go_module_metadata.go b/service/sagemakerfeaturestoreruntime/go_module_metadata.go
index 9d0027bed19..686eb89f3b0 100644
--- a/service/sagemakerfeaturestoreruntime/go_module_metadata.go
+++ b/service/sagemakerfeaturestoreruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakerfeaturestoreruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/sagemakergeospatial/CHANGELOG.md b/service/sagemakergeospatial/CHANGELOG.md
index 6db2eedb954..f15b9ebebe5 100644
--- a/service/sagemakergeospatial/CHANGELOG.md
+++ b/service/sagemakergeospatial/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakergeospatial/go.mod b/service/sagemakergeospatial/go.mod
index 10235af6630..aeb3248d488 100644
--- a/service/sagemakergeospatial/go.mod
+++ b/service/sagemakergeospatial/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakergeospatial
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakergeospatial/go_module_metadata.go b/service/sagemakergeospatial/go_module_metadata.go
index 53bca50de58..3de57849abb 100644
--- a/service/sagemakergeospatial/go_module_metadata.go
+++ b/service/sagemakergeospatial/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakergeospatial
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.13"
+const goModuleVersion = "1.14.14"
diff --git a/service/sagemakermetrics/CHANGELOG.md b/service/sagemakermetrics/CHANGELOG.md
index ecef810f03c..c045e84a9e7 100644
--- a/service/sagemakermetrics/CHANGELOG.md
+++ b/service/sagemakermetrics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.12.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.12.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakermetrics/go.mod b/service/sagemakermetrics/go.mod
index 5971340171c..3ed6138166e 100644
--- a/service/sagemakermetrics/go.mod
+++ b/service/sagemakermetrics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakermetrics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakermetrics/go_module_metadata.go b/service/sagemakermetrics/go_module_metadata.go
index ce8127301a6..521fc173078 100644
--- a/service/sagemakermetrics/go_module_metadata.go
+++ b/service/sagemakermetrics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakermetrics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.12.14"
+const goModuleVersion = "1.12.15"
diff --git a/service/sagemakerruntime/CHANGELOG.md b/service/sagemakerruntime/CHANGELOG.md
index b365cb228fb..cf487a891dc 100644
--- a/service/sagemakerruntime/CHANGELOG.md
+++ b/service/sagemakerruntime/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sagemakerruntime/go.mod b/service/sagemakerruntime/go.mod
index d429a67df01..2b046c12093 100644
--- a/service/sagemakerruntime/go.mod
+++ b/service/sagemakerruntime/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/sagemakerruntime
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sagemakerruntime/go_module_metadata.go b/service/sagemakerruntime/go_module_metadata.go
index fae40ad1943..098755742ee 100644
--- a/service/sagemakerruntime/go_module_metadata.go
+++ b/service/sagemakerruntime/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sagemakerruntime
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.13"
+const goModuleVersion = "1.32.14"
diff --git a/service/savingsplans/CHANGELOG.md b/service/savingsplans/CHANGELOG.md
index 24ede5e651e..442df28ed5b 100644
--- a/service/savingsplans/CHANGELOG.md
+++ b/service/savingsplans/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/savingsplans/go.mod b/service/savingsplans/go.mod
index f7b89e4ea95..cf11909b57f 100644
--- a/service/savingsplans/go.mod
+++ b/service/savingsplans/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/savingsplans
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/savingsplans/go_module_metadata.go b/service/savingsplans/go_module_metadata.go
index d71d0595c35..c2749d31009 100644
--- a/service/savingsplans/go_module_metadata.go
+++ b/service/savingsplans/go_module_metadata.go
@@ -3,4 +3,4 @@
 package savingsplans
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/scheduler/CHANGELOG.md b/service/scheduler/CHANGELOG.md
index c117767bfd5..d6a5d8036c6 100644
--- a/service/scheduler/CHANGELOG.md
+++ b/service/scheduler/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.12.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.12.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/scheduler/go.mod b/service/scheduler/go.mod
index a3d0ca46710..eb9f3678156 100644
--- a/service/scheduler/go.mod
+++ b/service/scheduler/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/scheduler
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/scheduler/go_module_metadata.go b/service/scheduler/go_module_metadata.go
index ad0175a9d23..edac9857b19 100644
--- a/service/scheduler/go_module_metadata.go
+++ b/service/scheduler/go_module_metadata.go
@@ -3,4 +3,4 @@
 package scheduler
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.12.14"
+const goModuleVersion = "1.12.15"
diff --git a/service/schemas/CHANGELOG.md b/service/schemas/CHANGELOG.md
index a961af9ae5e..5927db326d5 100644
--- a/service/schemas/CHANGELOG.md
+++ b/service/schemas/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.28.16 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/schemas/api_op_DescribeCodeBinding.go b/service/schemas/api_op_DescribeCodeBinding.go
index 63e2a95e843..e5610756023 100644
--- a/service/schemas/api_op_DescribeCodeBinding.go
+++ b/service/schemas/api_op_DescribeCodeBinding.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -335,52 +334,31 @@ func (w *CodeBindingExistsWaiter) WaitForOutput(ctx context.Context, params *Des
 func codeBindingExistsStateRetryable(ctx context.Context, input *DescribeCodeBindingInput, output *DescribeCodeBindingOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_COMPLETE"
-		value, ok := pathValue.(types.CodeGenerationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_IN_PROGRESS"
-		value, ok := pathValue.(types.CodeGenerationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "CREATE_FAILED"
-		value, ok := pathValue.(types.CodeGenerationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CodeGenerationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/schemas/generated.json b/service/schemas/generated.json
index 8267a9da085..0da2b1de28e 100644
--- a/service/schemas/generated.json
+++ b/service/schemas/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/schemas/go.mod b/service/schemas/go.mod
index bfe57fcb2d0..f954cb9f305 100644
--- a/service/schemas/go.mod
+++ b/service/schemas/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/schemas
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/schemas/go.sum b/service/schemas/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/schemas/go.sum
+++ b/service/schemas/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/schemas/go_module_metadata.go b/service/schemas/go_module_metadata.go
index ce49ff9582b..3c4318a4bad 100644
--- a/service/schemas/go_module_metadata.go
+++ b/service/schemas/go_module_metadata.go
@@ -3,4 +3,4 @@
 package schemas
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.15"
+const goModuleVersion = "1.28.16"
diff --git a/service/secretsmanager/CHANGELOG.md b/service/secretsmanager/CHANGELOG.md
index 70206f6cb4c..3961397d615 100644
--- a/service/secretsmanager/CHANGELOG.md
+++ b/service/secretsmanager/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/secretsmanager/go.mod b/service/secretsmanager/go.mod
index eea4f185db0..c29c40d9f7c 100644
--- a/service/secretsmanager/go.mod
+++ b/service/secretsmanager/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/secretsmanager
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/secretsmanager/go_module_metadata.go b/service/secretsmanager/go_module_metadata.go
index a9ee3fcc12a..caa53028479 100644
--- a/service/secretsmanager/go_module_metadata.go
+++ b/service/secretsmanager/go_module_metadata.go
@@ -3,4 +3,4 @@
 package secretsmanager
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.15"
+const goModuleVersion = "1.34.16"
diff --git a/service/securityhub/CHANGELOG.md b/service/securityhub/CHANGELOG.md
index 8bb01ebccfc..f91e34a3b5c 100644
--- a/service/securityhub/CHANGELOG.md
+++ b/service/securityhub/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.55.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.55.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/securityhub/go.mod b/service/securityhub/go.mod
index 2014cfe32b6..2ab124f35ff 100644
--- a/service/securityhub/go.mod
+++ b/service/securityhub/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/securityhub
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/securityhub/go_module_metadata.go b/service/securityhub/go_module_metadata.go
index 90f03fa0e20..2591a6c5305 100644
--- a/service/securityhub/go_module_metadata.go
+++ b/service/securityhub/go_module_metadata.go
@@ -3,4 +3,4 @@
 package securityhub
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.55.7"
+const goModuleVersion = "1.55.8"
diff --git a/service/securityir/CHANGELOG.md b/service/securityir/CHANGELOG.md
index 15b4a345315..ebca5c7be7a 100644
--- a/service/securityir/CHANGELOG.md
+++ b/service/securityir/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/securityir/go.mod b/service/securityir/go.mod
index 98cd30d7663..ea30d80bed3 100644
--- a/service/securityir/go.mod
+++ b/service/securityir/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/securityir
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/securityir/go_module_metadata.go b/service/securityir/go_module_metadata.go
index 02d457bd4dc..07ef15040c8 100644
--- a/service/securityir/go_module_metadata.go
+++ b/service/securityir/go_module_metadata.go
@@ -3,4 +3,4 @@
 package securityir
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.3"
+const goModuleVersion = "1.1.4"
diff --git a/service/securitylake/CHANGELOG.md b/service/securitylake/CHANGELOG.md
index 807c8e0efab..346c383fd4f 100644
--- a/service/securitylake/CHANGELOG.md
+++ b/service/securitylake/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.19.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.19.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/securitylake/go.mod b/service/securitylake/go.mod
index 7b19ec97c03..68fc8db2e99 100644
--- a/service/securitylake/go.mod
+++ b/service/securitylake/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/securitylake
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/securitylake/go_module_metadata.go b/service/securitylake/go_module_metadata.go
index 1433196d5fb..6c9c0a40a04 100644
--- a/service/securitylake/go_module_metadata.go
+++ b/service/securitylake/go_module_metadata.go
@@ -3,4 +3,4 @@
 package securitylake
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.19.12"
+const goModuleVersion = "1.19.13"
diff --git a/service/serverlessapplicationrepository/CHANGELOG.md b/service/serverlessapplicationrepository/CHANGELOG.md
index e3fbfe9e592..84bbd5b4289 100644
--- a/service/serverlessapplicationrepository/CHANGELOG.md
+++ b/service/serverlessapplicationrepository/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/serverlessapplicationrepository/go.mod b/service/serverlessapplicationrepository/go.mod
index d749ad87b34..7e66301cb5c 100644
--- a/service/serverlessapplicationrepository/go.mod
+++ b/service/serverlessapplicationrepository/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/serverlessapplicationrepository/go_module_metadata.go b/service/serverlessapplicationrepository/go_module_metadata.go
index 6ce4fe17c44..fbd661c6765 100644
--- a/service/serverlessapplicationrepository/go_module_metadata.go
+++ b/service/serverlessapplicationrepository/go_module_metadata.go
@@ -3,4 +3,4 @@
 package serverlessapplicationrepository
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/servicecatalog/CHANGELOG.md b/service/servicecatalog/CHANGELOG.md
index 17edf3c8a44..67ff2a34cae 100644
--- a/service/servicecatalog/CHANGELOG.md
+++ b/service/servicecatalog/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.32.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.32.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/servicecatalog/go.mod b/service/servicecatalog/go.mod
index ca0a0efd579..66ad41b7382 100644
--- a/service/servicecatalog/go.mod
+++ b/service/servicecatalog/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/servicecatalog
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/servicecatalog/go_module_metadata.go b/service/servicecatalog/go_module_metadata.go
index ceadabea7ae..5eacce4741f 100644
--- a/service/servicecatalog/go_module_metadata.go
+++ b/service/servicecatalog/go_module_metadata.go
@@ -3,4 +3,4 @@
 package servicecatalog
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.32.13"
+const goModuleVersion = "1.32.14"
diff --git a/service/servicecatalogappregistry/CHANGELOG.md b/service/servicecatalogappregistry/CHANGELOG.md
index 1e65e8da6f5..33cf3281112 100644
--- a/service/servicecatalogappregistry/CHANGELOG.md
+++ b/service/servicecatalogappregistry/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/servicecatalogappregistry/go.mod b/service/servicecatalogappregistry/go.mod
index 44f14c337f9..b1ee003b781 100644
--- a/service/servicecatalogappregistry/go.mod
+++ b/service/servicecatalogappregistry/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/servicecatalogappregistry/go_module_metadata.go b/service/servicecatalogappregistry/go_module_metadata.go
index 9aa73fc442c..a43396b0339 100644
--- a/service/servicecatalogappregistry/go_module_metadata.go
+++ b/service/servicecatalogappregistry/go_module_metadata.go
@@ -3,4 +3,4 @@
 package servicecatalogappregistry
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.13"
+const goModuleVersion = "1.30.14"
diff --git a/service/servicediscovery/CHANGELOG.md b/service/servicediscovery/CHANGELOG.md
index f558554baf7..69ac79a5153 100644
--- a/service/servicediscovery/CHANGELOG.md
+++ b/service/servicediscovery/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/servicediscovery/go.mod b/service/servicediscovery/go.mod
index 954f6044266..c79685f73f8 100644
--- a/service/servicediscovery/go.mod
+++ b/service/servicediscovery/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/servicediscovery
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/servicediscovery/go_module_metadata.go b/service/servicediscovery/go_module_metadata.go
index db3322e948c..7d03475cb37 100644
--- a/service/servicediscovery/go_module_metadata.go
+++ b/service/servicediscovery/go_module_metadata.go
@@ -3,4 +3,4 @@
 package servicediscovery
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.8"
+const goModuleVersion = "1.34.9"
diff --git a/service/servicequotas/CHANGELOG.md b/service/servicequotas/CHANGELOG.md
index c053e5cb782..203c56380d6 100644
--- a/service/servicequotas/CHANGELOG.md
+++ b/service/servicequotas/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/servicequotas/go.mod b/service/servicequotas/go.mod
index 6873bd8b1fc..bf7c190b205 100644
--- a/service/servicequotas/go.mod
+++ b/service/servicequotas/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/servicequotas
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/servicequotas/go_module_metadata.go b/service/servicequotas/go_module_metadata.go
index de57f33a0ea..55975261fb3 100644
--- a/service/servicequotas/go_module_metadata.go
+++ b/service/servicequotas/go_module_metadata.go
@@ -3,4 +3,4 @@
 package servicequotas
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.15"
+const goModuleVersion = "1.25.16"
diff --git a/service/ses/CHANGELOG.md b/service/ses/CHANGELOG.md
index fdb902a72b0..bfc45ccd3ab 100644
--- a/service/ses/CHANGELOG.md
+++ b/service/ses/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.29.9 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ses/api_op_GetIdentityVerificationAttributes.go b/service/ses/api_op_GetIdentityVerificationAttributes.go
index 1ad4338b7f9..d98537fc577 100644
--- a/service/ses/api_op_GetIdentityVerificationAttributes.go
+++ b/service/ses/api_op_GetIdentityVerificationAttributes.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -341,29 +340,18 @@ func (w *IdentityExistsWaiter) WaitForOutput(ctx context.Context, params *GetIde
 func identityExistsStateRetryable(ctx context.Context, input *GetIdentityVerificationAttributesInput, output *GetIdentityVerificationAttributesOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("VerificationAttributes.*.VerificationStatus", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.VerificationAttributes
+		var v2 []types.VerificationStatus
+		for _, v := range v1 {
+			v3 := v.VerificationStatus
+			v2 = append(v2, v3)
 		}
-
 		expectedValue := "Success"
-		var match = true
-		listOfValues, ok := pathValue.([]interface{})
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected list got %T", pathValue)
-		}
-
-		if len(listOfValues) == 0 {
-			match = false
-		}
-		for _, v := range listOfValues {
-			value, ok := v.(string)
-			if !ok {
-				return false, fmt.Errorf("waiter comparator expected string value, got %T", pathValue)
-			}
-
-			if string(value) != expectedValue {
+		match := len(v2) > 0
+		for _, v := range v2 {
+			if string(v) != expectedValue {
 				match = false
+				break
 			}
 		}
 
diff --git a/service/ses/generated.json b/service/ses/generated.json
index 4da1ae6620e..37161696147 100644
--- a/service/ses/generated.json
+++ b/service/ses/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/ses/go.mod b/service/ses/go.mod
index d9a0e803370..3bd56a50800 100644
--- a/service/ses/go.mod
+++ b/service/ses/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/ses
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/ses/go.sum b/service/ses/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/ses/go.sum
+++ b/service/ses/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/ses/go_module_metadata.go b/service/ses/go_module_metadata.go
index b838c1970dd..88f583502eb 100644
--- a/service/ses/go_module_metadata.go
+++ b/service/ses/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ses
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.8"
+const goModuleVersion = "1.29.9"
diff --git a/service/sesv2/CHANGELOG.md b/service/sesv2/CHANGELOG.md
index 5510df81f78..da189f94c29 100644
--- a/service/sesv2/CHANGELOG.md
+++ b/service/sesv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.41.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.41.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sesv2/go.mod b/service/sesv2/go.mod
index f21f3335b0c..6f15b5ca596 100644
--- a/service/sesv2/go.mod
+++ b/service/sesv2/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/sesv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sesv2/go_module_metadata.go b/service/sesv2/go_module_metadata.go
index 194f9167227..0ea320f0903 100644
--- a/service/sesv2/go_module_metadata.go
+++ b/service/sesv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sesv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.41.3"
+const goModuleVersion = "1.41.4"
diff --git a/service/sfn/CHANGELOG.md b/service/sfn/CHANGELOG.md
index 1e576ae6977..a33957b3a7d 100644
--- a/service/sfn/CHANGELOG.md
+++ b/service/sfn/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sfn/go.mod b/service/sfn/go.mod
index 658cf7fe8aa..47cfd07b53b 100644
--- a/service/sfn/go.mod
+++ b/service/sfn/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sfn
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sfn/go_module_metadata.go b/service/sfn/go_module_metadata.go
index 6c015271f50..527cfb4e6af 100644
--- a/service/sfn/go_module_metadata.go
+++ b/service/sfn/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sfn
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.9"
+const goModuleVersion = "1.34.10"
diff --git a/service/shield/CHANGELOG.md b/service/shield/CHANGELOG.md
index 7bcd8d6e059..5d6fdd354ca 100644
--- a/service/shield/CHANGELOG.md
+++ b/service/shield/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/shield/go.mod b/service/shield/go.mod
index f87b1e611a3..20c727c857a 100644
--- a/service/shield/go.mod
+++ b/service/shield/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/shield
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/shield/go_module_metadata.go b/service/shield/go_module_metadata.go
index 2d6e3373a54..59f520ec531 100644
--- a/service/shield/go_module_metadata.go
+++ b/service/shield/go_module_metadata.go
@@ -3,4 +3,4 @@
 package shield
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/signer/CHANGELOG.md b/service/signer/CHANGELOG.md
index 3bbefcb1a8a..378163818bd 100644
--- a/service/signer/CHANGELOG.md
+++ b/service/signer/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.26.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/signer/api_op_DescribeSigningJob.go b/service/signer/api_op_DescribeSigningJob.go
index b5e495034ac..e7425296e1c 100644
--- a/service/signer/api_op_DescribeSigningJob.go
+++ b/service/signer/api_op_DescribeSigningJob.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -374,35 +373,21 @@ func (w *SuccessfulSigningJobWaiter) WaitForOutput(ctx context.Context, params *
 func successfulSigningJobStateRetryable(ctx context.Context, input *DescribeSigningJobInput, output *DescribeSigningJobOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Succeeded"
-		value, ok := pathValue.(types.SigningStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SigningStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.SigningStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.SigningStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/signer/generated.json b/service/signer/generated.json
index 60c17a38a26..823c76e8ead 100644
--- a/service/signer/generated.json
+++ b/service/signer/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/signer/go.mod b/service/signer/go.mod
index 44e94a93006..7ac61b41d3c 100644
--- a/service/signer/go.mod
+++ b/service/signer/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/signer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/signer/go.sum b/service/signer/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/signer/go.sum
+++ b/service/signer/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/signer/go_module_metadata.go b/service/signer/go_module_metadata.go
index 7a2ba65a9cc..7a99a887ff6 100644
--- a/service/signer/go_module_metadata.go
+++ b/service/signer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package signer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.14"
+const goModuleVersion = "1.26.15"
diff --git a/service/simspaceweaver/CHANGELOG.md b/service/simspaceweaver/CHANGELOG.md
index 278e45f2813..543c18ca40e 100644
--- a/service/simspaceweaver/CHANGELOG.md
+++ b/service/simspaceweaver/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.14.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.14.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/simspaceweaver/go.mod b/service/simspaceweaver/go.mod
index d90c7176c1f..85353ce43c7 100644
--- a/service/simspaceweaver/go.mod
+++ b/service/simspaceweaver/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/simspaceweaver
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/simspaceweaver/go_module_metadata.go b/service/simspaceweaver/go_module_metadata.go
index e4b54014464..f677f831c2c 100644
--- a/service/simspaceweaver/go_module_metadata.go
+++ b/service/simspaceweaver/go_module_metadata.go
@@ -3,4 +3,4 @@
 package simspaceweaver
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.14.13"
+const goModuleVersion = "1.14.14"
diff --git a/service/sms/CHANGELOG.md b/service/sms/CHANGELOG.md
index de76578bba4..62ee44be41e 100644
--- a/service/sms/CHANGELOG.md
+++ b/service/sms/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sms/go.mod b/service/sms/go.mod
index 4fc36a13f6f..4634bcb3996 100644
--- a/service/sms/go.mod
+++ b/service/sms/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sms
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sms/go_module_metadata.go b/service/sms/go_module_metadata.go
index 28bf579e66e..c76f1d6d081 100644
--- a/service/sms/go_module_metadata.go
+++ b/service/sms/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sms
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/snowball/CHANGELOG.md b/service/snowball/CHANGELOG.md
index 02eba4b29be..6c7aa1ae8b9 100644
--- a/service/snowball/CHANGELOG.md
+++ b/service/snowball/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/snowball/go.mod b/service/snowball/go.mod
index 77274334312..c8598a598d9 100644
--- a/service/snowball/go.mod
+++ b/service/snowball/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/snowball
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/snowball/go_module_metadata.go b/service/snowball/go_module_metadata.go
index bcb1aa55f34..f29a55456f4 100644
--- a/service/snowball/go_module_metadata.go
+++ b/service/snowball/go_module_metadata.go
@@ -3,4 +3,4 @@
 package snowball
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.15"
+const goModuleVersion = "1.30.16"
diff --git a/service/snowdevicemanagement/CHANGELOG.md b/service/snowdevicemanagement/CHANGELOG.md
index 49ef89bb1de..3bfab2492a1 100644
--- a/service/snowdevicemanagement/CHANGELOG.md
+++ b/service/snowdevicemanagement/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.20.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.20.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/snowdevicemanagement/go.mod b/service/snowdevicemanagement/go.mod
index 400a07f1409..95a45b9dc25 100644
--- a/service/snowdevicemanagement/go.mod
+++ b/service/snowdevicemanagement/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/snowdevicemanagement
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/snowdevicemanagement/go_module_metadata.go b/service/snowdevicemanagement/go_module_metadata.go
index 86a2bd837a4..821313595a4 100644
--- a/service/snowdevicemanagement/go_module_metadata.go
+++ b/service/snowdevicemanagement/go_module_metadata.go
@@ -3,4 +3,4 @@
 package snowdevicemanagement
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.20.13"
+const goModuleVersion = "1.20.14"
diff --git a/service/sns/CHANGELOG.md b/service/sns/CHANGELOG.md
index 1856e058b79..daf539fe246 100644
--- a/service/sns/CHANGELOG.md
+++ b/service/sns/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.17 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.16 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sns/go.mod b/service/sns/go.mod
index b2b6ce3d92a..12593025836 100644
--- a/service/sns/go.mod
+++ b/service/sns/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sns
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sns/go_module_metadata.go b/service/sns/go_module_metadata.go
index 0c4ceb05046..d10c89aa217 100644
--- a/service/sns/go_module_metadata.go
+++ b/service/sns/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sns
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.16"
+const goModuleVersion = "1.33.17"
diff --git a/service/socialmessaging/CHANGELOG.md b/service/socialmessaging/CHANGELOG.md
index 4a9a91c1a75..d2862e05ecd 100644
--- a/service/socialmessaging/CHANGELOG.md
+++ b/service/socialmessaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.1.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.1.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/socialmessaging/go.mod b/service/socialmessaging/go.mod
index ccc04c01155..edddc1b0840 100644
--- a/service/socialmessaging/go.mod
+++ b/service/socialmessaging/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/socialmessaging
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/socialmessaging/go_module_metadata.go b/service/socialmessaging/go_module_metadata.go
index 0454a523dd3..af5e5454c81 100644
--- a/service/socialmessaging/go_module_metadata.go
+++ b/service/socialmessaging/go_module_metadata.go
@@ -3,4 +3,4 @@
 package socialmessaging
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.1.6"
+const goModuleVersion = "1.1.7"
diff --git a/service/sqs/CHANGELOG.md b/service/sqs/CHANGELOG.md
index 979810ec301..11449269715 100644
--- a/service/sqs/CHANGELOG.md
+++ b/service/sqs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.37.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.37.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sqs/go.mod b/service/sqs/go.mod
index a7614057653..4d23c07d646 100644
--- a/service/sqs/go.mod
+++ b/service/sqs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sqs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sqs/go_module_metadata.go b/service/sqs/go_module_metadata.go
index e672cb83a47..a88e7d31cb8 100644
--- a/service/sqs/go_module_metadata.go
+++ b/service/sqs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sqs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.37.11"
+const goModuleVersion = "1.37.12"
diff --git a/service/ssm/CHANGELOG.md b/service/ssm/CHANGELOG.md
index cf4b6f222da..bcf13bbb4bd 100644
--- a/service/ssm/CHANGELOG.md
+++ b/service/ssm/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.56.10 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.56.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssm/api_op_GetCommandInvocation.go b/service/ssm/api_op_GetCommandInvocation.go
index 7e573bf153b..a6c781be412 100644
--- a/service/ssm/api_op_GetCommandInvocation.go
+++ b/service/ssm/api_op_GetCommandInvocation.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -463,137 +462,81 @@ func (w *CommandExecutedWaiter) WaitForOutput(ctx context.Context, params *GetCo
 func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocationInput, output *GetCommandInvocationOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Pending"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "InProgress"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Delayed"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Success"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Cancelled"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "TimedOut"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Failed"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
-		}
-
+		v1 := output.Status
 		expectedValue := "Cancelling"
-		value, ok := pathValue.(types.CommandInvocationStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.CommandInvocationStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v1)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/ssm/generated.json b/service/ssm/generated.json
index f8082370860..b4dbce5a3e0 100644
--- a/service/ssm/generated.json
+++ b/service/ssm/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/ssm/go.mod b/service/ssm/go.mod
index 7e1c3734a2a..f551ddce60c 100644
--- a/service/ssm/go.mod
+++ b/service/ssm/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/ssm
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/ssm/go.sum b/service/ssm/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/ssm/go.sum
+++ b/service/ssm/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/ssm/go_module_metadata.go b/service/ssm/go_module_metadata.go
index e6f03b5ac66..0e76c589cec 100644
--- a/service/ssm/go_module_metadata.go
+++ b/service/ssm/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssm
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.56.9"
+const goModuleVersion = "1.56.10"
diff --git a/service/ssmcontacts/CHANGELOG.md b/service/ssmcontacts/CHANGELOG.md
index b2fcae31d0a..605fdf40b56 100644
--- a/service/ssmcontacts/CHANGELOG.md
+++ b/service/ssmcontacts/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssmcontacts/go.mod b/service/ssmcontacts/go.mod
index 117d0919ed0..7229547dbbb 100644
--- a/service/ssmcontacts/go.mod
+++ b/service/ssmcontacts/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ssmcontacts
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ssmcontacts/go_module_metadata.go b/service/ssmcontacts/go_module_metadata.go
index 8c082fa36fa..b6771cbc18e 100644
--- a/service/ssmcontacts/go_module_metadata.go
+++ b/service/ssmcontacts/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssmcontacts
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/ssmincidents/CHANGELOG.md b/service/ssmincidents/CHANGELOG.md
index 3cb3484c291..9ba4c3f45da 100644
--- a/service/ssmincidents/CHANGELOG.md
+++ b/service/ssmincidents/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.34.15 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssmincidents/api_op_GetReplicationSet.go b/service/ssmincidents/api_op_GetReplicationSet.go
index e26172a97ef..ad5c95f3567 100644
--- a/service/ssmincidents/api_op_GetReplicationSet.go
+++ b/service/ssmincidents/api_op_GetReplicationSet.go
@@ -12,7 +12,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -319,69 +318,61 @@ func (w *WaitForReplicationSetActiveWaiter) WaitForOutput(ctx context.Context, p
 func waitForReplicationSetActiveStateRetryable(ctx context.Context, input *GetReplicationSetInput, output *GetReplicationSetOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "ACTIVE"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "CREATING"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "UPDATING"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -563,35 +554,31 @@ func waitForReplicationSetDeletedStateRetryable(ctx context.Context, input *GetR
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "DELETING"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return true, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("replicationSet.status", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.ReplicationSet
+		var v2 types.ReplicationSetStatus
+		if v1 != nil {
+			v3 := v1.Status
+			v2 = v3
 		}
-
 		expectedValue := "FAILED"
-		value, ok := pathValue.(types.ReplicationSetStatus)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.ReplicationSetStatus value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/ssmincidents/generated.json b/service/ssmincidents/generated.json
index 9176e6686df..c8917fad939 100644
--- a/service/ssmincidents/generated.json
+++ b/service/ssmincidents/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/ssmincidents/go.mod b/service/ssmincidents/go.mod
index 1654d27a805..2123c4ae54d 100644
--- a/service/ssmincidents/go.mod
+++ b/service/ssmincidents/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/ssmincidents
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/ssmincidents/go.sum b/service/ssmincidents/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/ssmincidents/go.sum
+++ b/service/ssmincidents/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/ssmincidents/go_module_metadata.go b/service/ssmincidents/go_module_metadata.go
index 39909e24811..b3eba131718 100644
--- a/service/ssmincidents/go_module_metadata.go
+++ b/service/ssmincidents/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssmincidents
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.14"
+const goModuleVersion = "1.34.15"
diff --git a/service/ssmquicksetup/CHANGELOG.md b/service/ssmquicksetup/CHANGELOG.md
index b0b17059cf9..b7d4e2218fb 100644
--- a/service/ssmquicksetup/CHANGELOG.md
+++ b/service/ssmquicksetup/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.3.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.3.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssmquicksetup/go.mod b/service/ssmquicksetup/go.mod
index 997a15c5d47..2f645352993 100644
--- a/service/ssmquicksetup/go.mod
+++ b/service/ssmquicksetup/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ssmquicksetup
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ssmquicksetup/go_module_metadata.go b/service/ssmquicksetup/go_module_metadata.go
index bc2cd3d8bff..c6a0e1d84ab 100644
--- a/service/ssmquicksetup/go_module_metadata.go
+++ b/service/ssmquicksetup/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssmquicksetup
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.3.7"
+const goModuleVersion = "1.3.8"
diff --git a/service/ssmsap/CHANGELOG.md b/service/ssmsap/CHANGELOG.md
index 41f136ee9f3..ffeccc1de59 100644
--- a/service/ssmsap/CHANGELOG.md
+++ b/service/ssmsap/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.19.7 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.19.6 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssmsap/go.mod b/service/ssmsap/go.mod
index 3f391e86a0e..4ad82f7fc59 100644
--- a/service/ssmsap/go.mod
+++ b/service/ssmsap/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ssmsap
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ssmsap/go_module_metadata.go b/service/ssmsap/go_module_metadata.go
index 74d1667061c..4a663094379 100644
--- a/service/ssmsap/go_module_metadata.go
+++ b/service/ssmsap/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssmsap
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.19.6"
+const goModuleVersion = "1.19.7"
diff --git a/service/sso/CHANGELOG.md b/service/sso/CHANGELOG.md
index 4bddec44b7b..8a05d963e42 100644
--- a/service/sso/CHANGELOG.md
+++ b/service/sso/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sso/go.mod b/service/sso/go.mod
index b43812423d5..562b0af481e 100644
--- a/service/sso/go.mod
+++ b/service/sso/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/sso
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sso/go_module_metadata.go b/service/sso/go_module_metadata.go
index 6195b7cdd29..43c6740ed24 100644
--- a/service/sso/go_module_metadata.go
+++ b/service/sso/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sso
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/ssoadmin/CHANGELOG.md b/service/ssoadmin/CHANGELOG.md
index d222483e185..d316f839024 100644
--- a/service/ssoadmin/CHANGELOG.md
+++ b/service/ssoadmin/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssoadmin/go.mod b/service/ssoadmin/go.mod
index 90ca4b73464..c305e91a691 100644
--- a/service/ssoadmin/go.mod
+++ b/service/ssoadmin/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ssoadmin
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ssoadmin/go_module_metadata.go b/service/ssoadmin/go_module_metadata.go
index a5dd153e38e..c0fad060b9a 100644
--- a/service/ssoadmin/go_module_metadata.go
+++ b/service/ssoadmin/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssoadmin
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.13"
+const goModuleVersion = "1.29.14"
diff --git a/service/ssooidc/CHANGELOG.md b/service/ssooidc/CHANGELOG.md
index 4cf1cce5915..29bce60915b 100644
--- a/service/ssooidc/CHANGELOG.md
+++ b/service/ssooidc/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/ssooidc/go.mod b/service/ssooidc/go.mod
index b646fb7a162..ffd16455181 100644
--- a/service/ssooidc/go.mod
+++ b/service/ssooidc/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/ssooidc
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/ssooidc/go_module_metadata.go b/service/ssooidc/go_module_metadata.go
index 4f253f88db4..b338cba3478 100644
--- a/service/ssooidc/go_module_metadata.go
+++ b/service/ssooidc/go_module_metadata.go
@@ -3,4 +3,4 @@
 package ssooidc
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.12"
+const goModuleVersion = "1.28.13"
diff --git a/service/storagegateway/CHANGELOG.md b/service/storagegateway/CHANGELOG.md
index e469c841923..2313629ac2a 100644
--- a/service/storagegateway/CHANGELOG.md
+++ b/service/storagegateway/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/storagegateway/go.mod b/service/storagegateway/go.mod
index 7f59518aed2..c68a6edeebe 100644
--- a/service/storagegateway/go.mod
+++ b/service/storagegateway/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/storagegateway
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/storagegateway/go_module_metadata.go b/service/storagegateway/go_module_metadata.go
index 0ad24433a18..eb72d12c4c3 100644
--- a/service/storagegateway/go_module_metadata.go
+++ b/service/storagegateway/go_module_metadata.go
@@ -3,4 +3,4 @@
 package storagegateway
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/sts/CHANGELOG.md b/service/sts/CHANGELOG.md
index 746dd28cbe1..1e4be3d8a50 100644
--- a/service/sts/CHANGELOG.md
+++ b/service/sts/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.33.12 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.33.11 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/sts/go.mod b/service/sts/go.mod
index 1a8a8417ab6..8b5bb6a29a0 100644
--- a/service/sts/go.mod
+++ b/service/sts/go.mod
@@ -3,11 +3,11 @@ module github.com/aws/aws-sdk-go-v2/service/sts
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.11
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/sts/go_module_metadata.go b/service/sts/go_module_metadata.go
index a27f91e18ce..ae6b5789f25 100644
--- a/service/sts/go_module_metadata.go
+++ b/service/sts/go_module_metadata.go
@@ -3,4 +3,4 @@
 package sts
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.33.11"
+const goModuleVersion = "1.33.12"
diff --git a/service/supplychain/CHANGELOG.md b/service/supplychain/CHANGELOG.md
index 776a94350d8..30451707df9 100644
--- a/service/supplychain/CHANGELOG.md
+++ b/service/supplychain/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.6 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.5 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/supplychain/go.mod b/service/supplychain/go.mod
index 8ad49611c24..27a6a4b61be 100644
--- a/service/supplychain/go.mod
+++ b/service/supplychain/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/supplychain
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/supplychain/go_module_metadata.go b/service/supplychain/go_module_metadata.go
index a5a8c17088f..3c40d5b06c9 100644
--- a/service/supplychain/go_module_metadata.go
+++ b/service/supplychain/go_module_metadata.go
@@ -3,4 +3,4 @@
 package supplychain
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.5"
+const goModuleVersion = "1.11.6"
diff --git a/service/support/CHANGELOG.md b/service/support/CHANGELOG.md
index 1f0df1a5198..5b835d0a376 100644
--- a/service/support/CHANGELOG.md
+++ b/service/support/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.26.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.26.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/support/go.mod b/service/support/go.mod
index c2da0e47c65..8f0ee0cf9dd 100644
--- a/service/support/go.mod
+++ b/service/support/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/support
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/support/go_module_metadata.go b/service/support/go_module_metadata.go
index bd76b48fb46..21ba2f54ad6 100644
--- a/service/support/go_module_metadata.go
+++ b/service/support/go_module_metadata.go
@@ -3,4 +3,4 @@
 package support
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.26.13"
+const goModuleVersion = "1.26.14"
diff --git a/service/supportapp/CHANGELOG.md b/service/supportapp/CHANGELOG.md
index 1bb37837b00..45549bfe3cf 100644
--- a/service/supportapp/CHANGELOG.md
+++ b/service/supportapp/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.13.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.13.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/supportapp/go.mod b/service/supportapp/go.mod
index cf622a0316b..ed2f66038f6 100644
--- a/service/supportapp/go.mod
+++ b/service/supportapp/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/supportapp
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/supportapp/go_module_metadata.go b/service/supportapp/go_module_metadata.go
index 5cb33b2c044..84ae96d99f9 100644
--- a/service/supportapp/go_module_metadata.go
+++ b/service/supportapp/go_module_metadata.go
@@ -3,4 +3,4 @@
 package supportapp
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.13.13"
+const goModuleVersion = "1.13.14"
diff --git a/service/swf/CHANGELOG.md b/service/swf/CHANGELOG.md
index 6560468a726..79efdc3d56a 100644
--- a/service/swf/CHANGELOG.md
+++ b/service/swf/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.17 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.16 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/swf/go.mod b/service/swf/go.mod
index 373a9131883..ba9159548d9 100644
--- a/service/swf/go.mod
+++ b/service/swf/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/swf
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/swf/go_module_metadata.go b/service/swf/go_module_metadata.go
index f535dd9c1a0..5a3a8f81f76 100644
--- a/service/swf/go_module_metadata.go
+++ b/service/swf/go_module_metadata.go
@@ -3,4 +3,4 @@
 package swf
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.16"
+const goModuleVersion = "1.27.17"
diff --git a/service/synthetics/CHANGELOG.md b/service/synthetics/CHANGELOG.md
index 500d4a3373a..5559cf80df7 100644
--- a/service/synthetics/CHANGELOG.md
+++ b/service/synthetics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.31.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.31.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/synthetics/go.mod b/service/synthetics/go.mod
index 10ecc273af4..a8a46ba5c53 100644
--- a/service/synthetics/go.mod
+++ b/service/synthetics/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/synthetics
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/synthetics/go_module_metadata.go b/service/synthetics/go_module_metadata.go
index 3763ba57594..281af4ba563 100644
--- a/service/synthetics/go_module_metadata.go
+++ b/service/synthetics/go_module_metadata.go
@@ -3,4 +3,4 @@
 package synthetics
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.31.10"
+const goModuleVersion = "1.31.11"
diff --git a/service/taxsettings/CHANGELOG.md b/service/taxsettings/CHANGELOG.md
index 8c4210a369b..4846ad644d5 100644
--- a/service/taxsettings/CHANGELOG.md
+++ b/service/taxsettings/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.7.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.7.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/taxsettings/go.mod b/service/taxsettings/go.mod
index f65d9aed04e..65a4676dedb 100644
--- a/service/taxsettings/go.mod
+++ b/service/taxsettings/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/taxsettings
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/taxsettings/go_module_metadata.go b/service/taxsettings/go_module_metadata.go
index b65225b80ba..ae0cfc6cb19 100644
--- a/service/taxsettings/go_module_metadata.go
+++ b/service/taxsettings/go_module_metadata.go
@@ -3,4 +3,4 @@
 package taxsettings
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.7.7"
+const goModuleVersion = "1.7.8"
diff --git a/service/textract/CHANGELOG.md b/service/textract/CHANGELOG.md
index c8c98f6fb49..6f991b8be04 100644
--- a/service/textract/CHANGELOG.md
+++ b/service/textract/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.16 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.15 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/textract/go.mod b/service/textract/go.mod
index b7aa352fd09..0fe29c80914 100644
--- a/service/textract/go.mod
+++ b/service/textract/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/textract
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/textract/go_module_metadata.go b/service/textract/go_module_metadata.go
index 7b0d0eeadb2..97cd8959cfa 100644
--- a/service/textract/go_module_metadata.go
+++ b/service/textract/go_module_metadata.go
@@ -3,4 +3,4 @@
 package textract
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.15"
+const goModuleVersion = "1.34.16"
diff --git a/service/timestreaminfluxdb/CHANGELOG.md b/service/timestreaminfluxdb/CHANGELOG.md
index 776d15d2cd0..647bc296acf 100644
--- a/service/timestreaminfluxdb/CHANGELOG.md
+++ b/service/timestreaminfluxdb/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/timestreaminfluxdb/go.mod b/service/timestreaminfluxdb/go.mod
index 987c9336818..65d8fb7fa30 100644
--- a/service/timestreaminfluxdb/go.mod
+++ b/service/timestreaminfluxdb/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/timestreaminfluxdb/go_module_metadata.go b/service/timestreaminfluxdb/go_module_metadata.go
index a1bfb772905..fa40fb3daf0 100644
--- a/service/timestreaminfluxdb/go_module_metadata.go
+++ b/service/timestreaminfluxdb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package timestreaminfluxdb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.1"
+const goModuleVersion = "1.8.2"
diff --git a/service/timestreamquery/CHANGELOG.md b/service/timestreamquery/CHANGELOG.md
index 4a47691a58f..355a1e35e13 100644
--- a/service/timestreamquery/CHANGELOG.md
+++ b/service/timestreamquery/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/timestreamquery/go.mod b/service/timestreamquery/go.mod
index e18071bf278..c420607f211 100644
--- a/service/timestreamquery/go.mod
+++ b/service/timestreamquery/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/timestreamquery
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/timestreamquery/go_module_metadata.go b/service/timestreamquery/go_module_metadata.go
index 5522521ef4e..34082e833a4 100644
--- a/service/timestreamquery/go_module_metadata.go
+++ b/service/timestreamquery/go_module_metadata.go
@@ -3,4 +3,4 @@
 package timestreamquery
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.7"
+const goModuleVersion = "1.29.8"
diff --git a/service/timestreamwrite/CHANGELOG.md b/service/timestreamwrite/CHANGELOG.md
index 93cb187146d..efd5e188f13 100644
--- a/service/timestreamwrite/CHANGELOG.md
+++ b/service/timestreamwrite/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.29.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.29.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/timestreamwrite/go.mod b/service/timestreamwrite/go.mod
index 470a7312a91..80d1b4d859f 100644
--- a/service/timestreamwrite/go.mod
+++ b/service/timestreamwrite/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/timestreamwrite
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.11
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.12
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/timestreamwrite/go_module_metadata.go b/service/timestreamwrite/go_module_metadata.go
index 1c283dc7081..0cd050aacc2 100644
--- a/service/timestreamwrite/go_module_metadata.go
+++ b/service/timestreamwrite/go_module_metadata.go
@@ -3,4 +3,4 @@
 package timestreamwrite
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.29.14"
+const goModuleVersion = "1.29.15"
diff --git a/service/tnb/CHANGELOG.md b/service/tnb/CHANGELOG.md
index 157b567b0ff..baaed033a0e 100644
--- a/service/tnb/CHANGELOG.md
+++ b/service/tnb/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.13.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.13.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/tnb/go.mod b/service/tnb/go.mod
index 928f0e65982..b94ab71702e 100644
--- a/service/tnb/go.mod
+++ b/service/tnb/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/tnb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/tnb/go_module_metadata.go b/service/tnb/go_module_metadata.go
index 9db2458902b..5d858b6786c 100644
--- a/service/tnb/go_module_metadata.go
+++ b/service/tnb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package tnb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.13.13"
+const goModuleVersion = "1.13.14"
diff --git a/service/transcribe/CHANGELOG.md b/service/transcribe/CHANGELOG.md
index 1f6e460ea43..98542dc5c9b 100644
--- a/service/transcribe/CHANGELOG.md
+++ b/service/transcribe/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.42.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.42.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/transcribe/go.mod b/service/transcribe/go.mod
index 68afd6a1ac7..55085bbae9f 100644
--- a/service/transcribe/go.mod
+++ b/service/transcribe/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/transcribe
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/transcribe/go_module_metadata.go b/service/transcribe/go_module_metadata.go
index c3e5961928e..96d0d3cd2e7 100644
--- a/service/transcribe/go_module_metadata.go
+++ b/service/transcribe/go_module_metadata.go
@@ -3,4 +3,4 @@
 package transcribe
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.42.4"
+const goModuleVersion = "1.42.5"
diff --git a/service/transcribestreaming/CHANGELOG.md b/service/transcribestreaming/CHANGELOG.md
index 2c693474073..f3e79f1fb49 100644
--- a/service/transcribestreaming/CHANGELOG.md
+++ b/service/transcribestreaming/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.2 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/transcribestreaming/go.mod b/service/transcribestreaming/go.mod
index 805fee44c8a..07e9145b9c9 100644
--- a/service/transcribestreaming/go.mod
+++ b/service/transcribestreaming/go.mod
@@ -3,10 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/transcribestreaming
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/transcribestreaming/go_module_metadata.go b/service/transcribestreaming/go_module_metadata.go
index b8c7ea1cf61..0f91b179d6b 100644
--- a/service/transcribestreaming/go_module_metadata.go
+++ b/service/transcribestreaming/go_module_metadata.go
@@ -3,4 +3,4 @@
 package transcribestreaming
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.1"
+const goModuleVersion = "1.23.2"
diff --git a/service/transcribestreaming/internal/testing/go.mod b/service/transcribestreaming/internal/testing/go.mod
index 74f4982056b..045e84af269 100644
--- a/service/transcribestreaming/internal/testing/go.mod
+++ b/service/transcribestreaming/internal/testing/go.mod
@@ -3,17 +3,17 @@ module github.com/aws/aws-sdk-go-v2/service/transcribestreaming/internal/testing
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
+	github.com/aws/aws-sdk-go-v2 v1.36.0
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8
-	github.com/aws/aws-sdk-go-v2/service/internal/eventstreamtesting v1.5.17
-	github.com/aws/aws-sdk-go-v2/service/transcribestreaming v1.23.1
+	github.com/aws/aws-sdk-go-v2/service/internal/eventstreamtesting v1.5.18
+	github.com/aws/aws-sdk-go-v2/service/transcribestreaming v1.23.2
 	github.com/aws/smithy-go v1.22.2
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.57 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31 // indirect
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../../../
diff --git a/service/transfer/CHANGELOG.md b/service/transfer/CHANGELOG.md
index 05d973ab18b..c59f7981d75 100644
--- a/service/transfer/CHANGELOG.md
+++ b/service/transfer/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.56.2 (2025-01-31)
+
+* **Dependency Update**: Switch to code-generated waiter matchers, removing the dependency on go-jmespath.
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.56.1 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/transfer/api_op_DescribeServer.go b/service/transfer/api_op_DescribeServer.go
index b8fd4b01f1b..33fe3c5a34b 100644
--- a/service/transfer/api_op_DescribeServer.go
+++ b/service/transfer/api_op_DescribeServer.go
@@ -11,7 +11,6 @@ import (
 	smithytime "github.com/aws/smithy-go/time"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 	smithywaiter "github.com/aws/smithy-go/waiter"
-	jmespath "github.com/jmespath/go-jmespath"
 	"time"
 )
 
@@ -318,35 +317,31 @@ func (w *ServerOfflineWaiter) WaitForOutput(ctx context.Context, params *Describ
 func serverOfflineStateRetryable(ctx context.Context, input *DescribeServerInput, output *DescribeServerOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Server.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Server
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "OFFLINE"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Server.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Server
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "STOP_FAILED"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
@@ -516,35 +511,31 @@ func (w *ServerOnlineWaiter) WaitForOutput(ctx context.Context, params *Describe
 func serverOnlineStateRetryable(ctx context.Context, input *DescribeServerInput, output *DescribeServerOutput, err error) (bool, error) {
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Server.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Server
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "ONLINE"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, nil
 		}
 	}
 
 	if err == nil {
-		pathValue, err := jmespath.Search("Server.State", output)
-		if err != nil {
-			return false, fmt.Errorf("error evaluating waiter state: %w", err)
+		v1 := output.Server
+		var v2 types.State
+		if v1 != nil {
+			v3 := v1.State
+			v2 = v3
 		}
-
 		expectedValue := "START_FAILED"
-		value, ok := pathValue.(types.State)
-		if !ok {
-			return false, fmt.Errorf("waiter comparator expected types.State value, got %T", pathValue)
-		}
-
-		if string(value) == expectedValue {
+		var pathValue string
+		pathValue = string(v2)
+		if pathValue == expectedValue {
 			return false, fmt.Errorf("waiter state transitioned to Failure")
 		}
 	}
diff --git a/service/transfer/generated.json b/service/transfer/generated.json
index 72fbb7d45af..74b5f445b87 100644
--- a/service/transfer/generated.json
+++ b/service/transfer/generated.json
@@ -3,8 +3,7 @@
         "github.com/aws/aws-sdk-go-v2": "v1.4.0",
         "github.com/aws/aws-sdk-go-v2/internal/configsources": "v0.0.0-00010101000000-000000000000",
         "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2": "v2.0.0-00010101000000-000000000000",
-        "github.com/aws/smithy-go": "v1.4.0",
-        "github.com/jmespath/go-jmespath": "v0.4.0"
+        "github.com/aws/smithy-go": "v1.4.0"
     },
     "files": [
         "api_client.go",
diff --git a/service/transfer/go.mod b/service/transfer/go.mod
index af8b5146b35..72348f9b5ad 100644
--- a/service/transfer/go.mod
+++ b/service/transfer/go.mod
@@ -3,11 +3,10 @@ module github.com/aws/aws-sdk-go-v2/service/transfer
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
-	github.com/jmespath/go-jmespath v0.4.0
 )
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
diff --git a/service/transfer/go.sum b/service/transfer/go.sum
index 3df7c5c8b09..cad7e6ad46a 100644
--- a/service/transfer/go.sum
+++ b/service/transfer/go.sum
@@ -1,14 +1,2 @@
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/service/transfer/go_module_metadata.go b/service/transfer/go_module_metadata.go
index a6a7825bb5a..eb5e7e8606c 100644
--- a/service/transfer/go_module_metadata.go
+++ b/service/transfer/go_module_metadata.go
@@ -3,4 +3,4 @@
 package transfer
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.56.1"
+const goModuleVersion = "1.56.2"
diff --git a/service/translate/CHANGELOG.md b/service/translate/CHANGELOG.md
index 26e4e805c8e..784621e1d71 100644
--- a/service/translate/CHANGELOG.md
+++ b/service/translate/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.28.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.28.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/translate/go.mod b/service/translate/go.mod
index ec16773ef90..4b66ba50ae5 100644
--- a/service/translate/go.mod
+++ b/service/translate/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/translate
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/translate/go_module_metadata.go b/service/translate/go_module_metadata.go
index d729bf62473..18967735f17 100644
--- a/service/translate/go_module_metadata.go
+++ b/service/translate/go_module_metadata.go
@@ -3,4 +3,4 @@
 package translate
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.28.13"
+const goModuleVersion = "1.28.14"
diff --git a/service/trustedadvisor/CHANGELOG.md b/service/trustedadvisor/CHANGELOG.md
index 426f1888e7f..bac84e8e9eb 100644
--- a/service/trustedadvisor/CHANGELOG.md
+++ b/service/trustedadvisor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.8.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.8.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/trustedadvisor/go.mod b/service/trustedadvisor/go.mod
index d102edf65d0..b96f4321f06 100644
--- a/service/trustedadvisor/go.mod
+++ b/service/trustedadvisor/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/trustedadvisor
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/trustedadvisor/go_module_metadata.go b/service/trustedadvisor/go_module_metadata.go
index 763c4404ec5..842d4e84a4f 100644
--- a/service/trustedadvisor/go_module_metadata.go
+++ b/service/trustedadvisor/go_module_metadata.go
@@ -3,4 +3,4 @@
 package trustedadvisor
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.8.14"
+const goModuleVersion = "1.8.15"
diff --git a/service/verifiedpermissions/CHANGELOG.md b/service/verifiedpermissions/CHANGELOG.md
index 180bd2ce338..e925da02a88 100644
--- a/service/verifiedpermissions/CHANGELOG.md
+++ b/service/verifiedpermissions/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.21.1 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.21.0 (2025-01-30)
 
 * **Feature**: Adds Cedar JSON format support for entities and context data in authorization requests
diff --git a/service/verifiedpermissions/go.mod b/service/verifiedpermissions/go.mod
index f6efb1a3061..e300b582507 100644
--- a/service/verifiedpermissions/go.mod
+++ b/service/verifiedpermissions/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/verifiedpermissions
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/verifiedpermissions/go_module_metadata.go b/service/verifiedpermissions/go_module_metadata.go
index edd0a7ef428..639793f000b 100644
--- a/service/verifiedpermissions/go_module_metadata.go
+++ b/service/verifiedpermissions/go_module_metadata.go
@@ -3,4 +3,4 @@
 package verifiedpermissions
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.21.0"
+const goModuleVersion = "1.21.1"
diff --git a/service/voiceid/CHANGELOG.md b/service/voiceid/CHANGELOG.md
index ac77f5e02c7..1d941e154e8 100644
--- a/service/voiceid/CHANGELOG.md
+++ b/service/voiceid/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.24.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.24.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/voiceid/go.mod b/service/voiceid/go.mod
index 0b814b909b9..1b70d184f4d 100644
--- a/service/voiceid/go.mod
+++ b/service/voiceid/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/voiceid
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/voiceid/go_module_metadata.go b/service/voiceid/go_module_metadata.go
index e1adb29f1cf..69956eebf36 100644
--- a/service/voiceid/go_module_metadata.go
+++ b/service/voiceid/go_module_metadata.go
@@ -3,4 +3,4 @@
 package voiceid
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.24.13"
+const goModuleVersion = "1.24.14"
diff --git a/service/vpclattice/CHANGELOG.md b/service/vpclattice/CHANGELOG.md
index d41d0db8a89..287dc1503ba 100644
--- a/service/vpclattice/CHANGELOG.md
+++ b/service/vpclattice/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.13.9 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.13.8 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/vpclattice/go.mod b/service/vpclattice/go.mod
index 756cc025527..3f2142fcc74 100644
--- a/service/vpclattice/go.mod
+++ b/service/vpclattice/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/vpclattice
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/vpclattice/go_module_metadata.go b/service/vpclattice/go_module_metadata.go
index a840699bbfb..e18c51b9958 100644
--- a/service/vpclattice/go_module_metadata.go
+++ b/service/vpclattice/go_module_metadata.go
@@ -3,4 +3,4 @@
 package vpclattice
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.13.8"
+const goModuleVersion = "1.13.9"
diff --git a/service/waf/CHANGELOG.md b/service/waf/CHANGELOG.md
index 6d4958c72a5..85ccdbc9439 100644
--- a/service/waf/CHANGELOG.md
+++ b/service/waf/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/waf/go.mod b/service/waf/go.mod
index 1f19a9bfd7f..df568092489 100644
--- a/service/waf/go.mod
+++ b/service/waf/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/waf
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/waf/go_module_metadata.go b/service/waf/go_module_metadata.go
index 8b0556b5696..90543ff9582 100644
--- a/service/waf/go_module_metadata.go
+++ b/service/waf/go_module_metadata.go
@@ -3,4 +3,4 @@
 package waf
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/wafregional/CHANGELOG.md b/service/wafregional/CHANGELOG.md
index 1ea66aec1fe..b38288d4f02 100644
--- a/service/wafregional/CHANGELOG.md
+++ b/service/wafregional/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/wafregional/go.mod b/service/wafregional/go.mod
index 66cba414635..3b8fc013ca7 100644
--- a/service/wafregional/go.mod
+++ b/service/wafregional/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/wafregional
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/wafregional/go_module_metadata.go b/service/wafregional/go_module_metadata.go
index def6605d03a..8bc5347a4e7 100644
--- a/service/wafregional/go_module_metadata.go
+++ b/service/wafregional/go_module_metadata.go
@@ -3,4 +3,4 @@
 package wafregional
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/wafv2/CHANGELOG.md b/service/wafv2/CHANGELOG.md
index b9490069232..cdb25e961aa 100644
--- a/service/wafv2/CHANGELOG.md
+++ b/service/wafv2/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.55.13 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.55.12 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/wafv2/go.mod b/service/wafv2/go.mod
index f060aa38f85..2a01dacc294 100644
--- a/service/wafv2/go.mod
+++ b/service/wafv2/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/wafv2
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/wafv2/go_module_metadata.go b/service/wafv2/go_module_metadata.go
index d57e20b034c..6233e5db066 100644
--- a/service/wafv2/go_module_metadata.go
+++ b/service/wafv2/go_module_metadata.go
@@ -3,4 +3,4 @@
 package wafv2
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.55.12"
+const goModuleVersion = "1.55.13"
diff --git a/service/wellarchitected/CHANGELOG.md b/service/wellarchitected/CHANGELOG.md
index 08c0abf4c0a..80841f0ae89 100644
--- a/service/wellarchitected/CHANGELOG.md
+++ b/service/wellarchitected/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.34.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.34.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/wellarchitected/go.mod b/service/wellarchitected/go.mod
index 488791d3502..1db0fcc051b 100644
--- a/service/wellarchitected/go.mod
+++ b/service/wellarchitected/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/wellarchitected
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/wellarchitected/go_module_metadata.go b/service/wellarchitected/go_module_metadata.go
index c56d583d7ff..a3f09644a54 100644
--- a/service/wellarchitected/go_module_metadata.go
+++ b/service/wellarchitected/go_module_metadata.go
@@ -3,4 +3,4 @@
 package wellarchitected
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.34.13"
+const goModuleVersion = "1.34.14"
diff --git a/service/wisdom/CHANGELOG.md b/service/wisdom/CHANGELOG.md
index fb873571b05..ed0c773eef4 100644
--- a/service/wisdom/CHANGELOG.md
+++ b/service/wisdom/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.27.15 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.27.14 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/wisdom/go.mod b/service/wisdom/go.mod
index ec9888c0ab7..ac8781f87d3 100644
--- a/service/wisdom/go.mod
+++ b/service/wisdom/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/wisdom
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/wisdom/go_module_metadata.go b/service/wisdom/go_module_metadata.go
index 6409e0ce6ad..759eef2bd48 100644
--- a/service/wisdom/go_module_metadata.go
+++ b/service/wisdom/go_module_metadata.go
@@ -3,4 +3,4 @@
 package wisdom
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.27.14"
+const goModuleVersion = "1.27.15"
diff --git a/service/workdocs/CHANGELOG.md b/service/workdocs/CHANGELOG.md
index e71804cb584..af2b761dbd7 100644
--- a/service/workdocs/CHANGELOG.md
+++ b/service/workdocs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workdocs/go.mod b/service/workdocs/go.mod
index 6222a8f05cb..adddecd22a1 100644
--- a/service/workdocs/go.mod
+++ b/service/workdocs/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workdocs
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workdocs/go_module_metadata.go b/service/workdocs/go_module_metadata.go
index 251320d08b9..ee87440296c 100644
--- a/service/workdocs/go_module_metadata.go
+++ b/service/workdocs/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workdocs
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.13"
+const goModuleVersion = "1.25.14"
diff --git a/service/workmail/CHANGELOG.md b/service/workmail/CHANGELOG.md
index a3066cf4b02..6947ca69597 100644
--- a/service/workmail/CHANGELOG.md
+++ b/service/workmail/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.11 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.10 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workmail/go.mod b/service/workmail/go.mod
index bd267124706..f0197d1531c 100644
--- a/service/workmail/go.mod
+++ b/service/workmail/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workmail
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workmail/go_module_metadata.go b/service/workmail/go_module_metadata.go
index d0e6f73840f..9efc4bcd06c 100644
--- a/service/workmail/go_module_metadata.go
+++ b/service/workmail/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workmail
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.10"
+const goModuleVersion = "1.30.11"
diff --git a/service/workmailmessageflow/CHANGELOG.md b/service/workmailmessageflow/CHANGELOG.md
index b9885c072c1..f37bc177b73 100644
--- a/service/workmailmessageflow/CHANGELOG.md
+++ b/service/workmailmessageflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.23.14 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.23.13 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workmailmessageflow/go.mod b/service/workmailmessageflow/go.mod
index b3ac4529e16..b965f88d122 100644
--- a/service/workmailmessageflow/go.mod
+++ b/service/workmailmessageflow/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workmailmessageflow
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workmailmessageflow/go_module_metadata.go b/service/workmailmessageflow/go_module_metadata.go
index 2d2eccb0086..d892e427a83 100644
--- a/service/workmailmessageflow/go_module_metadata.go
+++ b/service/workmailmessageflow/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workmailmessageflow
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.23.13"
+const goModuleVersion = "1.23.14"
diff --git a/service/workspaces/CHANGELOG.md b/service/workspaces/CHANGELOG.md
index dd091d1d4bb..eb52b3ac6c2 100644
--- a/service/workspaces/CHANGELOG.md
+++ b/service/workspaces/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.52.4 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.52.3 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workspaces/go.mod b/service/workspaces/go.mod
index 2d72433cd9d..5c9ac0ff6ff 100644
--- a/service/workspaces/go.mod
+++ b/service/workspaces/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workspaces
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workspaces/go_module_metadata.go b/service/workspaces/go_module_metadata.go
index 031264118ce..64262a01fd3 100644
--- a/service/workspaces/go_module_metadata.go
+++ b/service/workspaces/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workspaces
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.52.3"
+const goModuleVersion = "1.52.4"
diff --git a/service/workspacesthinclient/CHANGELOG.md b/service/workspacesthinclient/CHANGELOG.md
index 1326e4892d5..f91c2b51143 100644
--- a/service/workspacesthinclient/CHANGELOG.md
+++ b/service/workspacesthinclient/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.11.5 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.11.4 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workspacesthinclient/go.mod b/service/workspacesthinclient/go.mod
index a0e1d621e5c..7b37735c5d4 100644
--- a/service/workspacesthinclient/go.mod
+++ b/service/workspacesthinclient/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workspacesthinclient
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workspacesthinclient/go_module_metadata.go b/service/workspacesthinclient/go_module_metadata.go
index 52f257a65a6..5e303476902 100644
--- a/service/workspacesthinclient/go_module_metadata.go
+++ b/service/workspacesthinclient/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workspacesthinclient
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.11.4"
+const goModuleVersion = "1.11.5"
diff --git a/service/workspacesweb/CHANGELOG.md b/service/workspacesweb/CHANGELOG.md
index 7a85657a504..2c75a3ecf43 100644
--- a/service/workspacesweb/CHANGELOG.md
+++ b/service/workspacesweb/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.25.8 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.25.7 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/workspacesweb/go.mod b/service/workspacesweb/go.mod
index 2d9edd46c4f..295dbb563de 100644
--- a/service/workspacesweb/go.mod
+++ b/service/workspacesweb/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/workspacesweb
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/workspacesweb/go_module_metadata.go b/service/workspacesweb/go_module_metadata.go
index a553669a364..dae5684a501 100644
--- a/service/workspacesweb/go_module_metadata.go
+++ b/service/workspacesweb/go_module_metadata.go
@@ -3,4 +3,4 @@
 package workspacesweb
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.25.7"
+const goModuleVersion = "1.25.8"
diff --git a/service/xray/CHANGELOG.md b/service/xray/CHANGELOG.md
index f2dd6457c8c..e369330cee0 100644
--- a/service/xray/CHANGELOG.md
+++ b/service/xray/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.30.10 (2025-01-31)
+
+* **Dependency Update**: Updated to the latest SDK module versions
+
 # v1.30.9 (2025-01-30)
 
 * **Dependency Update**: Updated to the latest SDK module versions
diff --git a/service/xray/go.mod b/service/xray/go.mod
index 320545d58e1..a4b42ecbb3f 100644
--- a/service/xray/go.mod
+++ b/service/xray/go.mod
@@ -3,9 +3,9 @@ module github.com/aws/aws-sdk-go-v2/service/xray
 go 1.21
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.35.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.30
+	github.com/aws/aws-sdk-go-v2 v1.36.0
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.31
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.31
 	github.com/aws/smithy-go v1.22.2
 )
 
diff --git a/service/xray/go_module_metadata.go b/service/xray/go_module_metadata.go
index 15aa60d8aba..22bb0ae7dff 100644
--- a/service/xray/go_module_metadata.go
+++ b/service/xray/go_module_metadata.go
@@ -3,4 +3,4 @@
 package xray
 
 // goModuleVersion is the tagged release for this module
-const goModuleVersion = "1.30.9"
+const goModuleVersion = "1.30.10"